carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-06 09:34:42 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Fix follow-on error for member access on an invalid expression. (#3303)

Browse Source 
We were looking at the type of the base expression prior to conversion
instead of the type after conversion.

As noted in review of #3302.
This commit is contained in:
Richard Smith
2023-10-17 21:18:26 +00:00
committed by GitHub
parent 69353ed271
commit efd8e1b144
3 changed files with 27 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/handle_name.cpp
+11 -11
View File
@@ -15,12 +15,12 @@ auto HandleMemberAccessExpression(Context& context, Parse::Node parse_node)
auto base_id = context.node_stack().PopExpression();
auto base =
context.semantics_ir().GetNode(context.FollowNameReferences(base_id));
if (auto namespc = base.TryAs<SemIR::Namespace>()) {
if (auto base_namespace = context.semantics_ir()
.GetNode(context.FollowNameReferences(base_id))
.TryAs<SemIR::Namespace>()) {
// For a namespace, just resolve the name.
auto node_id =
context.LookupName(parse_node, name_id, namespc->name_scope_id,
context.LookupName(parse_node, name_id, base_namespace->name_scope_id,
/*print_diagnostics=*/true);
auto node = context.semantics_ir().GetNode(node_id);
// TODO: Track that this node was named within `base_id`.
@@ -32,9 +32,10 @@ auto HandleMemberAccessExpression(Context& context, Parse::Node parse_node)
// Materialize a temporary for the base expression if necessary.
base_id = ConvertToValueOrReferenceExpression(context, base_id);
auto base_type_id = context.semantics_ir().GetNode(base_id).type_id();
auto base_type = context.semantics_ir().GetNode(
context.semantics_ir().GetTypeAllowBuiltinTypes(base.type_id()));
context.semantics_ir().GetTypeAllowBuiltinTypes(base_type_id));
switch (base_type.kind()) {
case SemIR::StructType::Kind: {
@@ -54,20 +55,19 @@ auto HandleMemberAccessExpression(Context& context, Parse::Node parse_node)
CARBON_DIAGNOSTIC(QualifiedExpressionNameNotFound, Error,
"Type `{0}` does not have a member `{1}`.", std::string,
llvm::StringRef);
context.emitter().Emit(
parse_node, QualifiedExpressionNameNotFound,
context.semantics_ir().StringifyType(base.type_id()),
context.semantics_ir().GetString(name_id));
context.emitter().Emit(parse_node, QualifiedExpressionNameNotFound,
context.semantics_ir().StringifyType(base_type_id),
context.semantics_ir().GetString(name_id));
break;
}
default: {
if (base.type_id() != SemIR::TypeId::Error) {
if (base_type_id != SemIR::TypeId::Error) {
CARBON_DIAGNOSTIC(QualifiedExpressionUnsupported, Error,
"Type `{0}` does not support qualified expressions.",
std::string);
context.emitter().Emit(
parse_node, QualifiedExpressionUnsupported,
context.semantics_ir().StringifyType(base.type_id()));
context.semantics_ir().StringifyType(base_type_id));
}
break;
}
toolchain/check/testdata/class/fail_incomplete.carbon
Vendored
+15 -18
View File
@@ -28,22 +28,19 @@ fn ConvertFromStruct() -> Class { return {}; }
// TODO: }
fn MemberAccess(p: Class*) -> i32 {
// CHECK:STDERR: fail_incomplete.carbon:[[@LINE+9]]:11: ERROR: Invalid use of incomplete type `Class`.
// CHECK:STDERR: fail_incomplete.carbon:[[@LINE+6]]:11: ERROR: Invalid use of incomplete type `Class`.
// CHECK:STDERR: return (*p).n;
// CHECK:STDERR: ^
// CHECK:STDERR: fail_incomplete.carbon:[[@LINE-27]]:1: Class was forward declared here.
// CHECK:STDERR: class Class;
// CHECK:STDERR: ^
// CHECK:STDERR: fail_incomplete.carbon:[[@LINE+3]]:14: ERROR: Type `Class` does not support qualified expressions.
// CHECK:STDERR: return (*p).n;
// CHECK:STDERR: ^
return (*p).n;
}
// CHECK:STDERR: fail_incomplete.carbon:[[@LINE+6]]:20: ERROR: Function returns incomplete type `Class`.
// CHECK:STDERR: fn Copy(p: Class*) -> Class {
// CHECK:STDERR: ^
// CHECK:STDERR: fail_incomplete.carbon:[[@LINE-39]]:1: Class was forward declared here.
// CHECK:STDERR: fail_incomplete.carbon:[[@LINE-36]]:1: Class was forward declared here.
// CHECK:STDERR: class Class;
// CHECK:STDERR: ^
fn Copy(p: Class*) -> Class {
@@ -54,7 +51,7 @@ fn Let(p: Class*) {
// CHECK:STDERR: fail_incomplete.carbon:[[@LINE+6]]:10: ERROR: `let` binding has incomplete type `Class`.
// CHECK:STDERR: let c: Class = *p;
// CHECK:STDERR: ^
// CHECK:STDERR: fail_incomplete.carbon:[[@LINE-50]]:1: Class was forward declared here.
// CHECK:STDERR: fail_incomplete.carbon:[[@LINE-47]]:1: Class was forward declared here.
// CHECK:STDERR: class Class;
// CHECK:STDERR: ^
let c: Class = *p;
@@ -67,7 +64,7 @@ fn TakeIncomplete(c: Class);
// CHECK:STDERR: fail_incomplete.carbon:[[@LINE+6]]:23: ERROR: Function returns incomplete type `Class`.
// CHECK:STDERR: fn ReturnIncomplete() -> Class;
// CHECK:STDERR: ^
// CHECK:STDERR: fail_incomplete.carbon:[[@LINE-63]]:1: Class was forward declared here.
// CHECK:STDERR: fail_incomplete.carbon:[[@LINE-60]]:1: Class was forward declared here.
// CHECK:STDERR: class Class;
// CHECK:STDERR: ^
fn ReturnIncomplete() -> Class;
@@ -76,7 +73,7 @@ fn CallTakeIncomplete(p: Class*) {
// CHECK:STDERR: fail_incomplete.carbon:[[@LINE+9]]:17: ERROR: Forming value of incomplete type `Class`.
// CHECK:STDERR: TakeIncomplete(*p);
// CHECK:STDERR: ^
// CHECK:STDERR: fail_incomplete.carbon:[[@LINE-72]]:1: Class was forward declared here.
// CHECK:STDERR: fail_incomplete.carbon:[[@LINE-69]]:1: Class was forward declared here.
// CHECK:STDERR: class Class;
// CHECK:STDERR: ^
// CHECK:STDERR: fail_incomplete.carbon:[[@LINE-19]]:1: Initializing parameter 1 of function declared here.
@@ -87,7 +84,7 @@ fn CallTakeIncomplete(p: Class*) {
// CHECK:STDERR: fail_incomplete.carbon:[[@LINE+9]]:17: ERROR: Forming value of incomplete type `Class`.
// CHECK:STDERR: TakeIncomplete({});
// CHECK:STDERR: ^
// CHECK:STDERR: fail_incomplete.carbon:[[@LINE-83]]:1: Class was forward declared here.
// CHECK:STDERR: fail_incomplete.carbon:[[@LINE-80]]:1: Class was forward declared here.
// CHECK:STDERR: class Class;
// CHECK:STDERR: ^
// CHECK:STDERR: fail_incomplete.carbon:[[@LINE-30]]:1: Initializing parameter 1 of function declared here.
@@ -126,14 +123,14 @@ fn CallReturnIncomplete() {
// CHECK:STDOUT: fn @MemberAccess(%p: Class*) -> i32 {
// CHECK:STDOUT: !entry:
// CHECK:STDOUT: %p.ref: Class* = name_reference "p", %p
// CHECK:STDOUT: %.loc40: ref Class = dereference %p.ref
// CHECK:STDOUT: %.loc37: ref Class = dereference %p.ref
// CHECK:STDOUT: return <error>
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: fn @Copy(%p: Class*) -> <error> {
// CHECK:STDOUT: !entry:
// CHECK:STDOUT: %p.ref: Class* = name_reference "p", %p
// CHECK:STDOUT: %.loc50: ref Class = dereference %p.ref
// CHECK:STDOUT: %.loc47: ref Class = dereference %p.ref
// CHECK:STDOUT: return <error>
// CHECK:STDOUT: }
// CHECK:STDOUT:
@@ -141,7 +138,7 @@ fn CallReturnIncomplete() {
// CHECK:STDOUT: !entry:
// CHECK:STDOUT: %Class.ref: type = name_reference "Class", package.%Class
// CHECK:STDOUT: %p.ref: Class* = name_reference "p", %p
// CHECK:STDOUT: %.loc60: ref Class = dereference %p.ref
// CHECK:STDOUT: %.loc57: ref Class = dereference %p.ref
// CHECK:STDOUT: %c: <error> = bind_name "c", <error>
// CHECK:STDOUT: return
// CHECK:STDOUT: }
@@ -152,18 +149,18 @@ fn CallReturnIncomplete() {
// CHECK:STDOUT:
// CHECK:STDOUT: fn @CallTakeIncomplete(%p: Class*) {
// CHECK:STDOUT: !entry:
// CHECK:STDOUT: %TakeIncomplete.ref.loc85: <function> = name_reference "TakeIncomplete", package.%TakeIncomplete
// CHECK:STDOUT: %TakeIncomplete.ref.loc82: <function> = name_reference "TakeIncomplete", package.%TakeIncomplete
// CHECK:STDOUT: %p.ref: Class* = name_reference "p", %p
// CHECK:STDOUT: %.loc85_18: ref Class = dereference %p.ref
// CHECK:STDOUT: %.loc85_17: type = tuple_type ()
// CHECK:STDOUT: %TakeIncomplete.ref.loc96: <function> = name_reference "TakeIncomplete", package.%TakeIncomplete
// CHECK:STDOUT: %.loc96: {} = struct_literal ()
// CHECK:STDOUT: %.loc82_18: ref Class = dereference %p.ref
// CHECK:STDOUT: %.loc82_17: type = tuple_type ()
// CHECK:STDOUT: %TakeIncomplete.ref.loc93: <function> = name_reference "TakeIncomplete", package.%TakeIncomplete
// CHECK:STDOUT: %.loc93: {} = struct_literal ()
// CHECK:STDOUT: return
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: fn @CallReturnIncomplete() {
// CHECK:STDOUT: !entry:
// CHECK:STDOUT: %ReturnIncomplete.ref: <function> = name_reference "ReturnIncomplete", package.%ReturnIncomplete
// CHECK:STDOUT: %.loc100: init <error> = call %ReturnIncomplete.ref()
// CHECK:STDOUT: %.loc97: init <error> = call %ReturnIncomplete.ref()
// CHECK:STDOUT: return
// CHECK:STDOUT: }
toolchain/check/testdata/struct/fail_member_of_function.carbon
Vendored
+1 -4
View File
@@ -5,12 +5,9 @@
// AUTOUPDATE
fn A() {
// CHECK:STDERR: fail_member_of_function.carbon:[[@LINE+6]]:3: ERROR: Expression cannot be used as a value.
// CHECK:STDERR: fail_member_of_function.carbon:[[@LINE+3]]:3: ERROR: Expression cannot be used as a value.
// CHECK:STDERR: A.y;
// CHECK:STDERR: ^
// CHECK:STDERR: fail_member_of_function.carbon:[[@LINE+3]]:4: ERROR: Type `<function>` does not support qualified expressions.
// CHECK:STDERR: A.y;
// CHECK:STDERR: ^
A.y;
}