mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-06 07:24:42 +01:00
Resolve the definition of the self specific when re-entering its scope for an inline method definition. (#4281)
This fixes a crash if an inline method definition attempts to access a member of the enclosing generic scope directly. Fixes #4229.
This commit is contained in:
Richard Smith
@@ -112,6 +112,12 @@ auto DeclNameStack::Restore(SuspendedName sus) -> void {
|
||||
// NOLINTNEXTLINE(performance-move-const-arg)
|
||||
decl_name_stack_.push_back(std::move(sus.name_context));
|
||||
for (auto& suspended_scope : llvm::reverse(sus.scopes)) {
|
||||
// Reattempt to resolve the definition of the specific. The generic might
|
||||
// have been defined after we suspended this scope.
|
||||
if (suspended_scope.entry.specific_id.is_valid()) {
|
||||
ResolveSpecificDefinition(*context_, suspended_scope.entry.specific_id);
|
||||
}
|
||||
|
||||
context_->scope_stack().Restore(std::move(suspended_scope));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -723,6 +723,17 @@ class Outer(T:! type) {
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: specific @Inner(constants.%T, constants.%U) {
|
||||
// CHECK:STDOUT: %U => constants.%U
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: !definition:
|
||||
// CHECK:STDOUT: %T => constants.%T
|
||||
// CHECK:STDOUT: %A.type => constants.%A.type.1
|
||||
// CHECK:STDOUT: %A => constants.%A.1
|
||||
// CHECK:STDOUT: %B.type => constants.%B.type.1
|
||||
// CHECK:STDOUT: %B => constants.%B.1
|
||||
// CHECK:STDOUT: %C.type => constants.%C.type.1
|
||||
// CHECK:STDOUT: %C => constants.%C.1
|
||||
// CHECK:STDOUT: %D.type => constants.%D.type.1
|
||||
// CHECK:STDOUT: %D => constants.%D.1
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: specific @Outer(@A.%T) {
|
||||
|
||||
@@ -206,6 +206,12 @@ class Class(U:! type) {
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: specific @CompleteClass(constants.%T) {
|
||||
// CHECK:STDOUT: %T => constants.%T
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: !definition:
|
||||
// CHECK:STDOUT: %CompleteClass => constants.%CompleteClass.2
|
||||
// CHECK:STDOUT: %.1 => constants.%.2
|
||||
// CHECK:STDOUT: %F.type => constants.%F.type.1
|
||||
// CHECK:STDOUT: %F => constants.%F.1
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: specific @F.1(constants.%T) {}
|
||||
@@ -358,6 +364,12 @@ class Class(U:! type) {
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: specific @CompleteClass(constants.%T) {
|
||||
// CHECK:STDOUT: %T => constants.%T
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: !definition:
|
||||
// CHECK:STDOUT: %CompleteClass => constants.%CompleteClass.2
|
||||
// CHECK:STDOUT: %.1 => constants.%.5
|
||||
// CHECK:STDOUT: %F.type => constants.%F.type.1
|
||||
// CHECK:STDOUT: %F => constants.%F.1
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: specific @CompleteClass(@CompleteClass.%T) {
|
||||
@@ -524,6 +536,12 @@ class Class(U:! type) {
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: specific @CompleteClass(constants.%T) {
|
||||
// CHECK:STDOUT: %T => constants.%T
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: !definition:
|
||||
// CHECK:STDOUT: %CompleteClass => constants.%CompleteClass.2
|
||||
// CHECK:STDOUT: %.1 => constants.%.3
|
||||
// CHECK:STDOUT: %F.type => constants.%F.type.1
|
||||
// CHECK:STDOUT: %F => constants.%F.1
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: specific @CompleteClass(@CompleteClass.%T) {
|
||||
@@ -711,6 +729,12 @@ class Class(U:! type) {
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: specific @CompleteClass(constants.%T) {
|
||||
// CHECK:STDOUT: %T => constants.%T
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: !definition:
|
||||
// CHECK:STDOUT: %CompleteClass => constants.%CompleteClass.2
|
||||
// CHECK:STDOUT: %.1 => constants.%.3
|
||||
// CHECK:STDOUT: %F.type => constants.%F.type.1
|
||||
// CHECK:STDOUT: %F => constants.%F.1
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: specific @CompleteClass(@CompleteClass.%T) {
|
||||
|
||||
+140
-27
@@ -8,6 +8,10 @@
|
||||
// TIP: To dump output, run:
|
||||
// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/check/testdata/class/generic/member_inline.carbon
|
||||
|
||||
// --- member_inline.carbon
|
||||
|
||||
library "member_inline.carbon";
|
||||
|
||||
class Class(T:! type) {
|
||||
fn F(n: T) -> T {
|
||||
return n;
|
||||
@@ -20,6 +24,20 @@ class Class(T:! type) {
|
||||
var n: T;
|
||||
}
|
||||
|
||||
// --- fail_member_inline.carbon
|
||||
|
||||
library "fail_member_inline.carbon";
|
||||
|
||||
class C(T:! type) {
|
||||
fn F() {
|
||||
// CHECK:STDERR: fail_member_inline.carbon:[[@LINE+3]]:5: ERROR: Expression cannot be used as a value.
|
||||
// CHECK:STDERR: data;
|
||||
// CHECK:STDERR: ^~~~
|
||||
data;
|
||||
}
|
||||
var data: {};
|
||||
}
|
||||
|
||||
// CHECK:STDOUT: --- member_inline.carbon
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: constants {
|
||||
@@ -57,12 +75,12 @@ class Class(T:! type) {
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT: %Core.import = import Core
|
||||
// CHECK:STDOUT: %Class.decl: %Class.type = class_decl @Class [template = constants.%Class.1] {
|
||||
// CHECK:STDOUT: %T.loc11_13.1: type = param T
|
||||
// CHECK:STDOUT: %T.loc11_13.2: type = bind_symbolic_name T 0, %T.loc11_13.1 [symbolic = @Class.%T (constants.%T)]
|
||||
// CHECK:STDOUT: %T.loc4_13.1: type = param T
|
||||
// CHECK:STDOUT: %T.loc4_13.2: type = bind_symbolic_name T 0, %T.loc4_13.1 [symbolic = @Class.%T (constants.%T)]
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: generic class @Class(file.%T.loc11_13.2: type) {
|
||||
// CHECK:STDOUT: generic class @Class(file.%T.loc4_13.2: type) {
|
||||
// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)]
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: !definition:
|
||||
@@ -75,57 +93,57 @@ class Class(T:! type) {
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: class {
|
||||
// CHECK:STDOUT: %F.decl: @Class.%F.type (%F.type) = fn_decl @F [symbolic = %F (constants.%F)] {
|
||||
// CHECK:STDOUT: %T.ref.loc12_11: type = name_ref T, file.%T.loc11_13.2 [symbolic = @F.%T (constants.%T)]
|
||||
// CHECK:STDOUT: %n.loc12_8.1: @F.%T (%T) = param n
|
||||
// CHECK:STDOUT: %n.loc12_8.2: @F.%T (%T) = bind_name n, %n.loc12_8.1
|
||||
// CHECK:STDOUT: %T.ref.loc12_17: type = name_ref T, file.%T.loc11_13.2 [symbolic = @F.%T (constants.%T)]
|
||||
// CHECK:STDOUT: %return.var.loc12: ref @F.%T (%T) = var <return slot>
|
||||
// CHECK:STDOUT: %T.ref.loc5_11: type = name_ref T, file.%T.loc4_13.2 [symbolic = @F.%T (constants.%T)]
|
||||
// CHECK:STDOUT: %n.loc5_8.1: @F.%T (%T) = param n
|
||||
// CHECK:STDOUT: %n.loc5_8.2: @F.%T (%T) = bind_name n, %n.loc5_8.1
|
||||
// CHECK:STDOUT: %T.ref.loc5_17: type = name_ref T, file.%T.loc4_13.2 [symbolic = @F.%T (constants.%T)]
|
||||
// CHECK:STDOUT: %return.var.loc5: ref @F.%T (%T) = var <return slot>
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT: %G.decl: @Class.%G.type (%G.type) = fn_decl @G [symbolic = %G (constants.%G)] {
|
||||
// CHECK:STDOUT: %.loc16: type = specific_constant constants.%Class.2, @Class(constants.%T) [symbolic = @G.%Class (constants.%Class.2)]
|
||||
// CHECK:STDOUT: %Self.ref: type = name_ref Self, %.loc16 [symbolic = @G.%Class (constants.%Class.2)]
|
||||
// CHECK:STDOUT: %self.loc16_8.1: @G.%Class (%Class.2) = param self
|
||||
// CHECK:STDOUT: %self.loc16_8.2: @G.%Class (%Class.2) = bind_name self, %self.loc16_8.1
|
||||
// CHECK:STDOUT: %T.ref.loc16: type = name_ref T, file.%T.loc11_13.2 [symbolic = @G.%T (constants.%T)]
|
||||
// CHECK:STDOUT: %return.var.loc16: ref @G.%T (%T) = var <return slot>
|
||||
// CHECK:STDOUT: %.loc9: type = specific_constant constants.%Class.2, @Class(constants.%T) [symbolic = @G.%Class (constants.%Class.2)]
|
||||
// CHECK:STDOUT: %Self.ref: type = name_ref Self, %.loc9 [symbolic = @G.%Class (constants.%Class.2)]
|
||||
// CHECK:STDOUT: %self.loc9_8.1: @G.%Class (%Class.2) = param self
|
||||
// CHECK:STDOUT: %self.loc9_8.2: @G.%Class (%Class.2) = bind_name self, %self.loc9_8.1
|
||||
// CHECK:STDOUT: %T.ref.loc9: type = name_ref T, file.%T.loc4_13.2 [symbolic = @G.%T (constants.%T)]
|
||||
// CHECK:STDOUT: %return.var.loc9: ref @G.%T (%T) = var <return slot>
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT: %T.ref.loc20: type = name_ref T, file.%T.loc11_13.2 [symbolic = %T (constants.%T)]
|
||||
// CHECK:STDOUT: %.loc20: @Class.%.1 (%.2) = field_decl n, element0 [template]
|
||||
// CHECK:STDOUT: %T.ref.loc13: type = name_ref T, file.%T.loc4_13.2 [symbolic = %T (constants.%T)]
|
||||
// CHECK:STDOUT: %.loc13: @Class.%.1 (%.2) = field_decl n, element0 [template]
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: !members:
|
||||
// CHECK:STDOUT: .Self = constants.%Class.2
|
||||
// CHECK:STDOUT: .F = %F.decl
|
||||
// CHECK:STDOUT: .G = %G.decl
|
||||
// CHECK:STDOUT: .n = %.loc20
|
||||
// CHECK:STDOUT: .n = %.loc13
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: generic fn @F(file.%T.loc11_13.2: type) {
|
||||
// CHECK:STDOUT: generic fn @F(file.%T.loc4_13.2: type) {
|
||||
// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)]
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: !definition:
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: fn(@Class.%n.loc12_8.2: @F.%T (%T)) -> @F.%T (%T) {
|
||||
// CHECK:STDOUT: fn(@Class.%n.loc5_8.2: @F.%T (%T)) -> @F.%T (%T) {
|
||||
// CHECK:STDOUT: !entry:
|
||||
// CHECK:STDOUT: %n.ref: @F.%T (%T) = name_ref n, @Class.%n.loc12_8.2
|
||||
// CHECK:STDOUT: %n.ref: @F.%T (%T) = name_ref n, @Class.%n.loc5_8.2
|
||||
// CHECK:STDOUT: return %n.ref
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: generic fn @G(file.%T.loc11_13.2: type) {
|
||||
// CHECK:STDOUT: generic fn @G(file.%T.loc4_13.2: type) {
|
||||
// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)]
|
||||
// CHECK:STDOUT: %Class: type = class_type @Class, @Class(%T) [symbolic = %Class (constants.%Class.2)]
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: !definition:
|
||||
// CHECK:STDOUT: %.1: type = unbound_element_type @G.%Class (%Class.2), @G.%T (%T) [symbolic = %.1 (constants.%.2)]
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: fn[@Class.%self.loc16_8.2: @G.%Class (%Class.2)]() -> @G.%T (%T) {
|
||||
// CHECK:STDOUT: fn[@Class.%self.loc9_8.2: @G.%Class (%Class.2)]() -> @G.%T (%T) {
|
||||
// CHECK:STDOUT: !entry:
|
||||
// CHECK:STDOUT: %self.ref: @G.%Class (%Class.2) = name_ref self, @Class.%self.loc16_8.2
|
||||
// CHECK:STDOUT: %n.ref: @G.%.1 (%.2) = name_ref n, @Class.%.loc20 [template = @Class.%.loc20]
|
||||
// CHECK:STDOUT: %.loc17_16.1: ref @G.%T (%T) = class_element_access %self.ref, element0
|
||||
// CHECK:STDOUT: %.loc17_16.2: @G.%T (%T) = bind_value %.loc17_16.1
|
||||
// CHECK:STDOUT: return %.loc17_16.2
|
||||
// CHECK:STDOUT: %self.ref: @G.%Class (%Class.2) = name_ref self, @Class.%self.loc9_8.2
|
||||
// CHECK:STDOUT: %n.ref: @G.%.1 (%.2) = name_ref n, @Class.%.loc13 [template = @Class.%.loc13]
|
||||
// CHECK:STDOUT: %.loc10_16.1: ref @G.%T (%T) = class_element_access %self.ref, element0
|
||||
// CHECK:STDOUT: %.loc10_16.2: @G.%T (%T) = bind_value %.loc10_16.1
|
||||
// CHECK:STDOUT: return %.loc10_16.2
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT:
|
||||
@@ -158,3 +176,98 @@ class Class(T:! type) {
|
||||
// CHECK:STDOUT: %T => constants.%T
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: --- fail_member_inline.carbon
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: constants {
|
||||
// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic]
|
||||
// CHECK:STDOUT: %C.type: type = generic_class_type @C [template]
|
||||
// CHECK:STDOUT: %.1: type = tuple_type () [template]
|
||||
// CHECK:STDOUT: %C.1: %C.type = struct_value () [template]
|
||||
// CHECK:STDOUT: %C.2: type = class_type @C, @C(%T) [symbolic]
|
||||
// CHECK:STDOUT: %F.type: type = fn_type @F, @C(%T) [symbolic]
|
||||
// CHECK:STDOUT: %F: %F.type = struct_value () [symbolic]
|
||||
// CHECK:STDOUT: %.2: type = struct_type {} [template]
|
||||
// CHECK:STDOUT: %.3: type = unbound_element_type %C.2, %.2 [symbolic]
|
||||
// CHECK:STDOUT: %.4: type = struct_type {.data: %.2} [template]
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: imports {
|
||||
// CHECK:STDOUT: %Core: <namespace> = namespace file.%Core.import, [template] {
|
||||
// CHECK:STDOUT: import Core//prelude
|
||||
// CHECK:STDOUT: import Core//prelude/operators
|
||||
// CHECK:STDOUT: import Core//prelude/types
|
||||
// CHECK:STDOUT: import Core//prelude/operators/arithmetic
|
||||
// CHECK:STDOUT: import Core//prelude/operators/as
|
||||
// CHECK:STDOUT: import Core//prelude/operators/bitwise
|
||||
// CHECK:STDOUT: import Core//prelude/operators/comparison
|
||||
// CHECK:STDOUT: import Core//prelude/types/bool
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: file {
|
||||
// CHECK:STDOUT: package: <namespace> = namespace [template] {
|
||||
// CHECK:STDOUT: .Core = imports.%Core
|
||||
// CHECK:STDOUT: .C = %C.decl
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT: %Core.import = import Core
|
||||
// CHECK:STDOUT: %C.decl: %C.type = class_decl @C [template = constants.%C.1] {
|
||||
// CHECK:STDOUT: %T.loc4_9.1: type = param T
|
||||
// CHECK:STDOUT: %T.loc4_9.2: type = bind_symbolic_name T 0, %T.loc4_9.1 [symbolic = @C.%T (constants.%T)]
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: generic class @C(file.%T.loc4_9.2: type) {
|
||||
// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)]
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: !definition:
|
||||
// CHECK:STDOUT: %F.type: type = fn_type @F, @C(%T) [symbolic = %F.type (constants.%F.type)]
|
||||
// CHECK:STDOUT: %F: @C.%F.type (%F.type) = struct_value () [symbolic = %F (constants.%F)]
|
||||
// CHECK:STDOUT: %C: type = class_type @C, @C(%T) [symbolic = %C (constants.%C.2)]
|
||||
// CHECK:STDOUT: %.1: type = unbound_element_type @C.%C (%C.2), %.2 [symbolic = %.1 (constants.%.3)]
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: class {
|
||||
// CHECK:STDOUT: %F.decl: @C.%F.type (%F.type) = fn_decl @F [symbolic = %F (constants.%F)] {}
|
||||
// CHECK:STDOUT: %.loc11_14.1: %.2 = struct_literal ()
|
||||
// CHECK:STDOUT: %.loc11_14.2: type = converted %.loc11_14.1, constants.%.2 [template = constants.%.2]
|
||||
// CHECK:STDOUT: %.loc11_11: @C.%.1 (%.3) = field_decl data, element0 [template]
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: !members:
|
||||
// CHECK:STDOUT: .Self = constants.%C.2
|
||||
// CHECK:STDOUT: .F = %F.decl
|
||||
// CHECK:STDOUT: .data = %.loc11_11
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: generic fn @F(file.%T.loc4_9.2: type) {
|
||||
// CHECK:STDOUT: !definition:
|
||||
// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)]
|
||||
// CHECK:STDOUT: %C: type = class_type @C, @C(%T) [symbolic = %C (constants.%C.2)]
|
||||
// CHECK:STDOUT: %.1: type = unbound_element_type @F.%C (%C.2), %.2 [symbolic = %.1 (constants.%.3)]
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: fn() {
|
||||
// CHECK:STDOUT: !entry:
|
||||
// CHECK:STDOUT: %data.ref: @F.%.1 (%.3) = name_ref data, @C.%.loc11_11 [template = @C.%.loc11_11]
|
||||
// CHECK:STDOUT: return
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: specific @C(constants.%T) {
|
||||
// CHECK:STDOUT: %T => constants.%T
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: !definition:
|
||||
// CHECK:STDOUT: %F.type => constants.%F.type
|
||||
// CHECK:STDOUT: %F => constants.%F
|
||||
// CHECK:STDOUT: %C => constants.%C.2
|
||||
// CHECK:STDOUT: %.1 => constants.%.3
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: specific @F(constants.%T) {}
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: specific @C(@C.%T) {
|
||||
// CHECK:STDOUT: %T => constants.%T
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: specific @C(@F.%T) {
|
||||
// CHECK:STDOUT: %T => constants.%T
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT:
|
||||
|
||||
Reference in New Issue
Block a user