Skip to content

Commit 09ca0b8

Browse files
authored
Update LLVM (#5605)
Some updates required for llvm/llvm-project#139584. Co-authored-by: Josh L <[email protected]>
1 parent 806bee1 commit 09ca0b8

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

MODULE.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ bazel_dep(name = "zstd", version = "1.5.6", repo_name = "llvm_zstd")
113113

114114
# We pin to specific upstream commits and try to track top-of-tree reasonably
115115
# closely rather than pinning to a specific release.
116-
# HEAD as of 2025-05-02.
117-
llvm_project_version = "98763433e66dd91bf5f10b1daf03d9373f07912a"
116+
# HEAD as of 2025-05-28.
117+
llvm_project_version = "7b074fc9362a4a6a5f172dd8936a22fb25eff96b"
118118

119119
# Load a repository for the raw llvm-project, pre-overlay.
120120
http_archive(
@@ -126,7 +126,7 @@ http_archive(
126126
"@carbon//bazel/llvm_project:0002_Added_Bazel_build_for_compiler_rt_fuzzer.patch",
127127
"@carbon//bazel/llvm_project:0003_Comment_out_unloaded_proto_library_dependencies.patch",
128128
],
129-
sha256 = "140ea04e8b1266a21926da5f1cbeee182c75086eaff2c0bf963538fea4d39014",
129+
sha256 = "07f80f32e81ac5dc19c5e49830f6d4a2e6208adb7d875ac3d1e8d043a602d9e4",
130130
strip_prefix = "llvm-project-{0}".format(llvm_project_version),
131131
urls = ["https://github.com/llvm/llvm-project/archive/{0}.tar.gz".format(llvm_project_version)],
132132
)

MODULE.bazel.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

toolchain/check/import_cpp.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,11 @@ class CarbonClangDiagnosticConsumer : public clang::DiagnosticConsumer {
8787
// TODO: Consider allowing setting `LangOptions` or use
8888
// `ASTContext::getLangOptions()`.
8989
clang::LangOptions lang_options;
90-
clang::TextDiagnostic text_diagnostic(
91-
diagnostics_stream, lang_options,
92-
// TODO: Consider allowing setting `DiagnosticOptions` or use
93-
// `ASTUnit::getDiagnostics().::getLangOptions().getDiagnosticOptions()`.
94-
new clang::DiagnosticOptions());
90+
// TODO: Consider allowing setting `DiagnosticOptions` or use
91+
// `ASTUnit::getDiagnostics().getLangOptions().getDiagnosticOptions()`.
92+
clang::DiagnosticOptions diagnostic_options;
93+
clang::TextDiagnostic text_diagnostic(diagnostics_stream, lang_options,
94+
diagnostic_options);
9595
text_diagnostic.emitDiagnostic(
9696
clang::FullSourceLoc(info.getLocation(), info.getSourceManager()),
9797
diag_level, message, info.getRanges(), info.getFixItHints());

toolchain/driver/clang_runner.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,18 +75,18 @@ auto ClangRunner::Run(llvm::ArrayRef<llvm::StringRef> args) -> bool {
7575

7676
// Create the diagnostic options and parse arguments controlling them out of
7777
// our arguments.
78-
llvm::IntrusiveRefCntPtr<clang::DiagnosticOptions> diagnostic_options =
78+
std::unique_ptr<clang::DiagnosticOptions> diagnostic_options =
7979
clang::CreateAndPopulateDiagOpts(cstr_args);
8080

8181
// TODO: We don't yet support serializing diagnostics the way the actual
8282
// `clang` command line does. Unclear if we need to or not, but it would need
8383
// a bit more logic here to set up chained consumers.
8484
clang::TextDiagnosticPrinter diagnostic_client(llvm::errs(),
85-
diagnostic_options.get());
85+
*diagnostic_options);
8686

87-
clang::DiagnosticsEngine diagnostics(
88-
diagnostic_ids_, diagnostic_options.get(), &diagnostic_client,
89-
/*ShouldOwnClient=*/false);
87+
clang::DiagnosticsEngine diagnostics(diagnostic_ids_, *diagnostic_options,
88+
&diagnostic_client,
89+
/*ShouldOwnClient=*/false);
9090
clang::ProcessWarningOptions(diagnostics, *diagnostic_options, *fs_);
9191

9292
clang::driver::Driver driver(clang_path, target_, diagnostics,

0 commit comments

Comments
 (0)