Browse Source

Update the LLVM submodule. (#935)

Among other things, this brings compatibility fixes with upstream
GoogleTest and Windows Bazel build support fixes.
Chandler Carruth 4 years ago
parent
commit
ec7a670d84
2 changed files with 2 additions and 1 deletions
  1. 1 0
      .gitmodules
  2. 1 1
      migrate_cpp/cpp_refactoring/main.cpp

+ 1 - 0
.gitmodules

@@ -5,6 +5,7 @@
 [submodule "third_party/llvm-project"]
 	path = third_party/llvm-project
 	url = https://github.com/llvm/llvm-project.git
+	branch = main
 [submodule "third_party/examples/brotli/original"]
 	path = third_party/examples/brotli/original
 	url = https://github.com/google/brotli

+ 1 - 1
migrate_cpp/cpp_refactoring/main.cpp

@@ -19,7 +19,7 @@ static void InitReplacements(RefactoringTool* tool) {
   for (const std::string& path : tool->getSourcePaths()) {
     llvm::ErrorOr<const clang::FileEntry*> file = files.getFile(path);
     if (file.getError()) {
-      llvm::report_fatal_error("Error accessing `" + path +
+      llvm::report_fatal_error(llvm::Twine("Error accessing `") + path +
                                "`: " + file.getError().message() + "\n");
     }
     repl.insert({files.getCanonicalName(*file).str(), {}});