mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-05 06:41:06 +01:00
When diagnosing a duplicate name, point to the name instead of the instruction (#4953)
Left TODOs where more work is necessary before this change can be applied or its impact can be verified. Includes #4952, to avoid regression in some cases. Similar to #4938. See https://discord.com/channels/655572317891461132/655578254970716160/1339007384361762857.
This commit is contained in:
@@ -180,7 +180,7 @@ auto DeclNameStack::AddNameOrDiagnose(NameContext name_context,
|
||||
DiagnosePoisonedName(*context_, name_context.poisoning_loc_id,
|
||||
name_context.loc_id);
|
||||
} else if (auto id = name_context.prev_inst_id(); id.has_value()) {
|
||||
DiagnoseDuplicateName(*context_, target_id, id);
|
||||
DiagnoseDuplicateName(*context_, name_context.loc_id, id);
|
||||
} else {
|
||||
AddName(name_context, target_id, access_kind);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user