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

Update LLVM and fix related breaks (#3237)

Browse Source 
Updates to a recent LLVM commit.

The patch file changes because there's now an upstream BUILD.bazel for
compiler-rt in the overlay, although it still doesn't expose the
libfuzzer target, so we need to keep patching it.

Clang's FileManager API changed slightly so we update migrate_cpp for
that.
This commit is contained in:
Jon Ross-Perkins
2023-09-15 00:03:05 +00:00
committed by GitHub
parent 4bed4887b4
commit c66283b7c8
3 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
migrate_cpp/cpp_refactoring/main.cpp
+3 -3
View File
@@ -17,10 +17,10 @@ static void InitReplacements(RefactoringTool* tool) {
clang::FileManager& files = tool->getFiles();
Carbon::Matcher::ReplacementMap& repl = tool->getReplacements();
for (const std::string& path : tool->getSourcePaths()) {
llvm::ErrorOr<const clang::FileEntry*> file = files.getFile(path);
if (file.getError()) {
llvm::Expected<clang::FileEntryRef> file = files.getFileRef(path);
if (!file) {
llvm::report_fatal_error(llvm::Twine("Error accessing `") + path +
"`: " + file.getError().message() + "\n");
"`: " + llvm::toString(file.takeError()) + "\n");
}
repl.insert({files.getCanonicalName(*file).str(), {}});
}