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

Avoid ToTokenOnly for the AddrSelfIsNonRef diagnostic (#5371)

Browse Source 
The location of the diagnostic is an instruction id, not a parse node.
Converting to a parse node to call ToTokenOnly will drop the descendents
of the instruction being diagnosed, but the diagnostic is about the
whole instruction not just the root parse node of whatever instruction
it happens to be.
This commit is contained in:
Dana Jansens
2025-04-29 15:25:27 +00:00
committed by GitHub
parent 7c85397f8b
commit e2984d9fc3
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/pattern_match.cpp
+1 -3
View File
@@ -261,9 +261,7 @@ auto MatchContext::DoEmitPatternMatch(Context& context,
default:
CARBON_DIAGNOSTIC(AddrSelfIsNonRef, Error,
"`addr self` method cannot be invoked on a value");
context.emitter().Emit(
context.insts().GetCanonicalLocId(entry.scrutinee_id).ToTokenOnly(),
AddrSelfIsNonRef);
context.emitter().Emit(entry.scrutinee_id, AddrSelfIsNonRef);
// Add fake reference expression to preserve invariants.
auto scrutinee = context.insts().GetWithLocId(entry.scrutinee_id);
scrutinee_ref_id = AddInstWithCleanup<SemIR::TemporaryStorage>(
toolchain/check/testdata/class/fail_memaccess_category.carbon
Vendored
+4 -4
View File
@@ -18,9 +18,9 @@ class B {
fn F(s: {.a: A}, b: B) {
// `s` has only a value representation, so this must be invalid.
// CHECK:STDERR: fail_memaccess_category.carbon:[[@LINE+7]]:4: error: `addr self` method cannot be invoked on a value [AddrSelfIsNonRef]
// CHECK:STDERR: fail_memaccess_category.carbon:[[@LINE+7]]:3: error: `addr self` method cannot be invoked on a value [AddrSelfIsNonRef]
// CHECK:STDERR: s.a.F();
// CHECK:STDERR: ^
// CHECK:STDERR: ^~~
// CHECK:STDERR: fail_memaccess_category.carbon:[[@LINE-12]]:8: note: initializing function parameter [InCallToFunctionParam]
// CHECK:STDERR: fn F[addr self: A*]();
// CHECK:STDERR: ^~~~~~~~~~~~~
@@ -29,9 +29,9 @@ fn F(s: {.a: A}, b: B) {
// `b` has an object representation for `A`, but this is still invalid for
// consistency.
// CHECK:STDERR: fail_memaccess_category.carbon:[[@LINE+7]]:4: error: `addr self` method cannot be invoked on a value [AddrSelfIsNonRef]
// CHECK:STDERR: fail_memaccess_category.carbon:[[@LINE+7]]:3: error: `addr self` method cannot be invoked on a value [AddrSelfIsNonRef]
// CHECK:STDERR: b.a.F();
// CHECK:STDERR: ^
// CHECK:STDERR: ^~~
// CHECK:STDERR: fail_memaccess_category.carbon:[[@LINE-23]]:8: note: initializing function parameter [InCallToFunctionParam]
// CHECK:STDERR: fn F[addr self: A*]();
// CHECK:STDERR: ^~~~~~~~~~~~~