diff --git a/interpreter/llvm-project/clang/include/clang/Basic/SourceLocation.h b/interpreter/llvm-project/clang/include/clang/Basic/SourceLocation.h index 28810d21763e2..540de23b9f55e 100644 --- a/interpreter/llvm-project/clang/include/clang/Basic/SourceLocation.h +++ b/interpreter/llvm-project/clang/include/clang/Basic/SourceLocation.h @@ -431,7 +431,6 @@ class FullSourceLoc : public SourceLocation { /// \returns true if this source location comes before 'Loc', false otherwise. bool isBeforeInTranslationUnitThan(FullSourceLoc Loc) const { assert(Loc.isValid()); - if (!SrcMgr) return true; // assume command line is before Loc assert(SrcMgr == Loc.SrcMgr && "Loc comes from another SourceManager!"); return isBeforeInTranslationUnitThan((SourceLocation)Loc); } diff --git a/interpreter/llvm-project/clang/lib/Basic/SourceManager.cpp b/interpreter/llvm-project/clang/lib/Basic/SourceManager.cpp index 42abc2963c2c3..a00edddfa3823 100644 --- a/interpreter/llvm-project/clang/lib/Basic/SourceManager.cpp +++ b/interpreter/llvm-project/clang/lib/Basic/SourceManager.cpp @@ -2095,10 +2095,7 @@ bool SourceManager::isBeforeInTranslationUnit(SourceLocation LHS, return LIsScratch; return LOffs.second < ROffs.second; } - //AXEL: Work around diags from include chains not rooted in main file. - //AXEL: llvm_unreachable("Unsortable locations found"); - assert(0 && "Unsortable locations found"); - return LOffs.first < ROffs.first; + llvm_unreachable("Unsortable locations found"); } std::pair SourceManager::isInTheSameTranslationUnit( diff --git a/interpreter/llvm-project/clang/lib/CodeGen/CodeGenModule.cpp b/interpreter/llvm-project/clang/lib/CodeGen/CodeGenModule.cpp index 1f47c4edda42f..4255578d82087 100644 --- a/interpreter/llvm-project/clang/lib/CodeGen/CodeGenModule.cpp +++ b/interpreter/llvm-project/clang/lib/CodeGen/CodeGenModule.cpp @@ -2243,9 +2243,7 @@ static void emitUsed(CodeGenModule &CGM, StringRef Name, void CodeGenModule::emitLLVMUsed() { emitUsed(*this, "llvm.used", LLVMUsed); - LLVMUsed.clear(); emitUsed(*this, "llvm.compiler.used", LLVMCompilerUsed); - LLVMCompilerUsed.clear(); } void CodeGenModule::AppendLinkerOptions(StringRef Opts) { diff --git a/interpreter/llvm-project/llvm-project.tag b/interpreter/llvm-project/llvm-project.tag index cdffb187bc861..d866fa6a7f1b2 100644 --- a/interpreter/llvm-project/llvm-project.tag +++ b/interpreter/llvm-project/llvm-project.tag @@ -1 +1 @@ -ROOT-llvm13-20230704-01 +ROOT-llvm13-20230707-01