carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-03 22:02:51 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

location -> loc abbreviation (#3826)

Browse Source
This commit is contained in:
Jon Ross-Perkins
2024-03-28 18:15:18 +00:00
committed by GitHub
parent 72564a08d4
commit b5d28f2c4b
48 changed files with 341 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/function.cpp
+2 -2
View File
@@ -193,7 +193,7 @@ auto CheckFunctionTypeMatches(Context& context,
// Checks to see if a structurally valid redeclaration is allowed in context.
// These all still merge.
static auto CheckIsAllowedRedecl(Context& context, SemIR::LocationId loc_id,
static auto CheckIsAllowedRedecl(Context& context, SemIR::LocId loc_id,
SemIR::Function& new_function,
bool new_is_definition,
SemIR::Function& prev_function,
@@ -253,7 +253,7 @@ static auto CheckIsAllowedRedecl(Context& context, SemIR::LocationId loc_id,
// TODO: Detect conflicting cross-file declarations, as well as uses of imported
// declarations followed by a redeclaration.
auto MergeFunctionRedecl(Context& context, SemIR::LocationId loc_id,
auto MergeFunctionRedecl(Context& context, SemIR::LocId loc_id,
SemIR::Function& new_function, bool new_is_definition,
SemIR::FunctionId prev_function_id,
bool prev_is_import) -> bool {