carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-05 22:02:55 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Rename template constant -> concrete constant. (#4939)

Browse Source 
This implements a direction decided in a
[recent
discussion](https://docs.google.com/document/d/1Iut5f2TQBrtBNIduF4vJYOKfw7MbS8xH_J01_Q4e6Rk/edit?resourcekey=0-mc_vh5UzrzXfU4kO-3tOjA&tab=t.0#heading=h.mas1g68xx9ct)
to switch away from "template constant" when naming a constant that
doesn't depend on any generic parameters, because that creates confusion
with template-dependent constant values that depend on a template
parameter.
This commit is contained in:
Richard Smith
2025-02-12 21:24:51 +00:00
committed by GitHub
parent 188821ba1a
commit c6d35e1c4a
674 changed files with 35160 additions and 35160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/testdata/const/basic.carbon
Vendored
+35 -35
View File
@@ -19,21 +19,21 @@ fn B(p: const (i32*)) -> const (i32*) {
// CHECK:STDOUT: --- basic.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: %int_32: Core.IntLiteral = int_value 32 [template]
// CHECK:STDOUT: %i32: type = class_type @Int, @Int(%int_32) [template]
// CHECK:STDOUT: %const.20a: type = const_type %i32 [template]
// CHECK:STDOUT: %ptr.36b: type = ptr_type %const.20a [template]
// CHECK:STDOUT: %ptr.3bc: type = ptr_type %ptr.36b [template]
// CHECK:STDOUT: %A.type: type = fn_type @A [template]
// CHECK:STDOUT: %A: %A.type = struct_value () [template]
// CHECK:STDOUT: %ptr.235: type = ptr_type %i32 [template]
// CHECK:STDOUT: %const.12f: type = const_type %ptr.235 [template]
// CHECK:STDOUT: %B.type: type = fn_type @B [template]
// CHECK:STDOUT: %B: %B.type = struct_value () [template]
// CHECK:STDOUT: %int_32: Core.IntLiteral = int_value 32 [concrete]
// CHECK:STDOUT: %i32: type = class_type @Int, @Int(%int_32) [concrete]
// CHECK:STDOUT: %const.20a: type = const_type %i32 [concrete]
// CHECK:STDOUT: %ptr.36b: type = ptr_type %const.20a [concrete]
// CHECK:STDOUT: %ptr.3bc: type = ptr_type %ptr.36b [concrete]
// CHECK:STDOUT: %A.type: type = fn_type @A [concrete]
// CHECK:STDOUT: %A: %A.type = struct_value () [concrete]
// CHECK:STDOUT: %ptr.235: type = ptr_type %i32 [concrete]
// CHECK:STDOUT: %const.12f: type = const_type %ptr.235 [concrete]
// CHECK:STDOUT: %B.type: type = fn_type @B [concrete]
// CHECK:STDOUT: %B: %B.type = struct_value () [concrete]
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: imports {
// CHECK:STDOUT: %Core: <namespace> = namespace file.%Core.import, [template] {
// CHECK:STDOUT: %Core: <namespace> = namespace file.%Core.import, [concrete] {
// CHECK:STDOUT: .Int = %Core.Int
// CHECK:STDOUT: import Core//prelude
// CHECK:STDOUT: import Core//prelude/...
@@ -41,51 +41,51 @@ fn B(p: const (i32*)) -> const (i32*) {
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace [template] {
// CHECK:STDOUT: package: <namespace> = namespace [concrete] {
// CHECK:STDOUT: .Core = imports.%Core
// CHECK:STDOUT: .A = %A.decl
// CHECK:STDOUT: .B = %B.decl
// CHECK:STDOUT: }
// CHECK:STDOUT: %Core.import = import Core
// CHECK:STDOUT: %A.decl: %A.type = fn_decl @A [template = constants.%A] {
// CHECK:STDOUT: %A.decl: %A.type = fn_decl @A [concrete = constants.%A] {
// CHECK:STDOUT: %p.patt: %ptr.3bc = binding_pattern p
// CHECK:STDOUT: %p.param_patt: %ptr.3bc = value_param_pattern %p.patt, runtime_param0
// CHECK:STDOUT: %return.patt: %ptr.3bc = return_slot_pattern
// CHECK:STDOUT: %return.param_patt: %ptr.3bc = out_param_pattern %return.patt, runtime_param1
// CHECK:STDOUT: } {
// CHECK:STDOUT: %int_32.loc11_31: Core.IntLiteral = int_value 32 [template = constants.%int_32]
// CHECK:STDOUT: %i32.loc11_31: type = class_type @Int, @Int(constants.%int_32) [template = constants.%i32]
// CHECK:STDOUT: %const.loc11_25: type = const_type %i32 [template = constants.%const.20a]
// CHECK:STDOUT: %ptr.loc11_34: type = ptr_type %const.20a [template = constants.%ptr.36b]
// CHECK:STDOUT: %ptr.loc11_35: type = ptr_type %ptr.36b [template = constants.%ptr.3bc]
// CHECK:STDOUT: %int_32.loc11_31: Core.IntLiteral = int_value 32 [concrete = constants.%int_32]
// CHECK:STDOUT: %i32.loc11_31: type = class_type @Int, @Int(constants.%int_32) [concrete = constants.%i32]
// CHECK:STDOUT: %const.loc11_25: type = const_type %i32 [concrete = constants.%const.20a]
// CHECK:STDOUT: %ptr.loc11_34: type = ptr_type %const.20a [concrete = constants.%ptr.36b]
// CHECK:STDOUT: %ptr.loc11_35: type = ptr_type %ptr.36b [concrete = constants.%ptr.3bc]
// CHECK:STDOUT: %p.param: %ptr.3bc = value_param runtime_param0
// CHECK:STDOUT: %.loc11: type = splice_block %ptr.loc11_19 [template = constants.%ptr.3bc] {
// CHECK:STDOUT: %int_32.loc11_15: Core.IntLiteral = int_value 32 [template = constants.%int_32]
// CHECK:STDOUT: %i32.loc11_15: type = class_type @Int, @Int(constants.%int_32) [template = constants.%i32]
// CHECK:STDOUT: %const.loc11_9: type = const_type %i32 [template = constants.%const.20a]
// CHECK:STDOUT: %ptr.loc11_18: type = ptr_type %const.20a [template = constants.%ptr.36b]
// CHECK:STDOUT: %ptr.loc11_19: type = ptr_type %ptr.36b [template = constants.%ptr.3bc]
// CHECK:STDOUT: %.loc11: type = splice_block %ptr.loc11_19 [concrete = constants.%ptr.3bc] {
// CHECK:STDOUT: %int_32.loc11_15: Core.IntLiteral = int_value 32 [concrete = constants.%int_32]
// CHECK:STDOUT: %i32.loc11_15: type = class_type @Int, @Int(constants.%int_32) [concrete = constants.%i32]
// CHECK:STDOUT: %const.loc11_9: type = const_type %i32 [concrete = constants.%const.20a]
// CHECK:STDOUT: %ptr.loc11_18: type = ptr_type %const.20a [concrete = constants.%ptr.36b]
// CHECK:STDOUT: %ptr.loc11_19: type = ptr_type %ptr.36b [concrete = constants.%ptr.3bc]
// CHECK:STDOUT: }
// CHECK:STDOUT: %p: %ptr.3bc = bind_name p, %p.param
// CHECK:STDOUT: %return.param: ref %ptr.3bc = out_param runtime_param1
// CHECK:STDOUT: %return: ref %ptr.3bc = return_slot %return.param
// CHECK:STDOUT: }
// CHECK:STDOUT: %B.decl: %B.type = fn_decl @B [template = constants.%B] {
// CHECK:STDOUT: %B.decl: %B.type = fn_decl @B [concrete = constants.%B] {
// CHECK:STDOUT: %p.patt: %const.12f = binding_pattern p
// CHECK:STDOUT: %p.param_patt: %const.12f = value_param_pattern %p.patt, runtime_param0
// CHECK:STDOUT: %return.patt: %const.12f = return_slot_pattern
// CHECK:STDOUT: %return.param_patt: %const.12f = out_param_pattern %return.patt, runtime_param1
// CHECK:STDOUT: } {
// CHECK:STDOUT: %int_32.loc15_33: Core.IntLiteral = int_value 32 [template = constants.%int_32]
// CHECK:STDOUT: %i32.loc15_33: type = class_type @Int, @Int(constants.%int_32) [template = constants.%i32]
// CHECK:STDOUT: %ptr.loc15_36: type = ptr_type %i32 [template = constants.%ptr.235]
// CHECK:STDOUT: %const.loc15_26: type = const_type %ptr.235 [template = constants.%const.12f]
// CHECK:STDOUT: %int_32.loc15_33: Core.IntLiteral = int_value 32 [concrete = constants.%int_32]
// CHECK:STDOUT: %i32.loc15_33: type = class_type @Int, @Int(constants.%int_32) [concrete = constants.%i32]
// CHECK:STDOUT: %ptr.loc15_36: type = ptr_type %i32 [concrete = constants.%ptr.235]
// CHECK:STDOUT: %const.loc15_26: type = const_type %ptr.235 [concrete = constants.%const.12f]
// CHECK:STDOUT: %p.param: %const.12f = value_param runtime_param0
// CHECK:STDOUT: %.loc15: type = splice_block %const.loc15_9 [template = constants.%const.12f] {
// CHECK:STDOUT: %int_32.loc15_16: Core.IntLiteral = int_value 32 [template = constants.%int_32]
// CHECK:STDOUT: %i32.loc15_16: type = class_type @Int, @Int(constants.%int_32) [template = constants.%i32]
// CHECK:STDOUT: %ptr.loc15_19: type = ptr_type %i32 [template = constants.%ptr.235]
// CHECK:STDOUT: %const.loc15_9: type = const_type %ptr.235 [template = constants.%const.12f]
// CHECK:STDOUT: %.loc15: type = splice_block %const.loc15_9 [concrete = constants.%const.12f] {
// CHECK:STDOUT: %int_32.loc15_16: Core.IntLiteral = int_value 32 [concrete = constants.%int_32]
// CHECK:STDOUT: %i32.loc15_16: type = class_type @Int, @Int(constants.%int_32) [concrete = constants.%i32]
// CHECK:STDOUT: %ptr.loc15_19: type = ptr_type %i32 [concrete = constants.%ptr.235]
// CHECK:STDOUT: %const.loc15_9: type = const_type %ptr.235 [concrete = constants.%const.12f]
// CHECK:STDOUT: }
// CHECK:STDOUT: %p: %const.12f = bind_name p, %p.param
// CHECK:STDOUT: %return.param: ref %const.12f = out_param runtime_param1