carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-06 07:24:42 +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/pointer/nested_const.carbon
Vendored
+23 -23
View File
@@ -16,19 +16,19 @@ fn F(p: const (const (const i32*)*)) -> const i32 {
// CHECK:STDOUT: --- nested_const.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: %const.58f: type = const_type %ptr.36b [template]
// CHECK:STDOUT: %ptr.6e8: type = ptr_type %const.58f [template]
// CHECK:STDOUT: %const.fa2: type = const_type %ptr.6e8 [template]
// CHECK:STDOUT: %F.type: type = fn_type @F [template]
// CHECK:STDOUT: %F: %F.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: %const.58f: type = const_type %ptr.36b [concrete]
// CHECK:STDOUT: %ptr.6e8: type = ptr_type %const.58f [concrete]
// CHECK:STDOUT: %const.fa2: type = const_type %ptr.6e8 [concrete]
// CHECK:STDOUT: %F.type: type = fn_type @F [concrete]
// CHECK:STDOUT: %F: %F.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/...
@@ -36,29 +36,29 @@ fn F(p: const (const (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: .F = %F.decl
// CHECK:STDOUT: }
// CHECK:STDOUT: %Core.import = import Core
// CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] {
// CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [concrete = constants.%F] {
// CHECK:STDOUT: %p.patt: %const.fa2 = binding_pattern p
// CHECK:STDOUT: %p.param_patt: %const.fa2 = value_param_pattern %p.patt, runtime_param0
// CHECK:STDOUT: %return.patt: %const.20a = return_slot_pattern
// CHECK:STDOUT: %return.param_patt: %const.20a = out_param_pattern %return.patt, runtime_param1
// CHECK:STDOUT: } {
// CHECK:STDOUT: %int_32.loc12_47: Core.IntLiteral = int_value 32 [template = constants.%int_32]
// CHECK:STDOUT: %i32.loc12_47: type = class_type @Int, @Int(constants.%int_32) [template = constants.%i32]
// CHECK:STDOUT: %const.loc12_41: type = const_type %i32 [template = constants.%const.20a]
// CHECK:STDOUT: %int_32.loc12_47: Core.IntLiteral = int_value 32 [concrete = constants.%int_32]
// CHECK:STDOUT: %i32.loc12_47: type = class_type @Int, @Int(constants.%int_32) [concrete = constants.%i32]
// CHECK:STDOUT: %const.loc12_41: type = const_type %i32 [concrete = constants.%const.20a]
// CHECK:STDOUT: %p.param: %const.fa2 = value_param runtime_param0
// CHECK:STDOUT: %.loc12: type = splice_block %const.loc12_9 [template = constants.%const.fa2] {
// CHECK:STDOUT: %int_32.loc12_29: Core.IntLiteral = int_value 32 [template = constants.%int_32]
// CHECK:STDOUT: %i32.loc12_29: type = class_type @Int, @Int(constants.%int_32) [template = constants.%i32]
// CHECK:STDOUT: %const.loc12_23: type = const_type %i32 [template = constants.%const.20a]
// CHECK:STDOUT: %ptr.loc12_32: type = ptr_type %const.20a [template = constants.%ptr.36b]
// CHECK:STDOUT: %const.loc12_16: type = const_type %ptr.36b [template = constants.%const.58f]
// CHECK:STDOUT: %ptr.loc12_34: type = ptr_type %const.58f [template = constants.%ptr.6e8]
// CHECK:STDOUT: %const.loc12_9: type = const_type %ptr.6e8 [template = constants.%const.fa2]
// CHECK:STDOUT: %.loc12: type = splice_block %const.loc12_9 [concrete = constants.%const.fa2] {
// CHECK:STDOUT: %int_32.loc12_29: Core.IntLiteral = int_value 32 [concrete = constants.%int_32]
// CHECK:STDOUT: %i32.loc12_29: type = class_type @Int, @Int(constants.%int_32) [concrete = constants.%i32]
// CHECK:STDOUT: %const.loc12_23: type = const_type %i32 [concrete = constants.%const.20a]
// CHECK:STDOUT: %ptr.loc12_32: type = ptr_type %const.20a [concrete = constants.%ptr.36b]
// CHECK:STDOUT: %const.loc12_16: type = const_type %ptr.36b [concrete = constants.%const.58f]
// CHECK:STDOUT: %ptr.loc12_34: type = ptr_type %const.58f [concrete = constants.%ptr.6e8]
// CHECK:STDOUT: %const.loc12_9: type = const_type %ptr.6e8 [concrete = constants.%const.fa2]
// CHECK:STDOUT: }
// CHECK:STDOUT: %p: %const.fa2 = bind_name p, %p.param
// CHECK:STDOUT: %return.param: ref %const.20a = out_param runtime_param1