Skip to content

Commit b0896e3

Browse files
committed
Merge branch 'trunk' into toolchain-overload-diagnostics
2 parents c375a13 + ef488f0 commit b0896e3

File tree

12 files changed

+482
-464
lines changed

12 files changed

+482
-464
lines changed

toolchain/check/BUILD

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ cc_library(
2424
"cpp/custom_type_mapping.cpp",
2525
"cpp/import.cpp",
2626
"cpp/location.cpp",
27+
"cpp/operators.cpp",
2728
"cpp/overload_resolution.cpp",
2829
"cpp/thunk.cpp",
2930
"cpp/type_mapping.cpp",
@@ -74,6 +75,7 @@ cc_library(
7475
"cpp/custom_type_mapping.h",
7576
"cpp/import.h",
7677
"cpp/location.h",
78+
"cpp/operators.h",
7779
"cpp/overload_resolution.h",
7880
"cpp/thunk.h",
7981
"cpp/type_mapping.h",

toolchain/check/context.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,9 @@ class Context {
286286
auto ast_context() -> clang::ASTContext& {
287287
return sem_ir().clang_ast_unit()->getASTContext();
288288
}
289+
auto clang_decls() -> SemIR::ClangDeclStore& {
290+
return sem_ir().clang_decls();
291+
}
289292
auto names() -> SemIR::NameStoreWrapper { return sem_ir().names(); }
290293
auto name_scopes() -> SemIR::NameScopeStore& {
291294
return sem_ir().name_scopes();

0 commit comments

Comments
 (0)