Skip to content

Revert three more Clang patches #13181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hahnjo merged 4 commits into from
Jul 7, 2023
Merged

Revert three more Clang patches #13181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3773b7d
[clang] Revert changes to emitLLVMUsed
hahnjo Jul 5, 2023
6ee2166
[clang] Revert changes to SourceManager::isBeforeInTranslationUnit
hahnjo Jul 5, 2023
969d16e
[clang] Revert change in SourceLocation::isBeforeInTranslationUnitThan
hahnjo Jul 5, 2023
12cf7d2
[llvm-project] Bump to tag ROOT-llvm13-20230707-01
hahnjo Jul 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion interpreter/llvm-project/clang/include/clang/Basic/SourceLocation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
5 changes: 1 addition & 4 deletions interpreter/llvm-project/clang/lib/Basic/SourceManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Copy link
Member

@vgvassilev vgvassilev Jul 5, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thiw would corrupt the stack if it reaches here. That's the problem can be triggered by generated code.

Copy link
Member Author

@hahnjo hahnjo Jul 5, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I see... So you prefer to keep this patch for now? (edit: see also my argument above about initializeVirtualFile)

Copy link
Member

@vgvassilev vgvassilev Jul 5, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure. I believe that the initializeVirtualFile is not sufficient in the cases where we generate code (via the ast synthesizers) where we pass invalid source locations. However, it might be worth to try. Let's ask cmssw.

}

std::pair<bool, bool> SourceManager::isInTheSameTranslationUnit(
Expand Down
2 changes: 0 additions & 2 deletions interpreter/llvm-project/clang/lib/CodeGen/CodeGenModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion interpreter/llvm-project/llvm-project.tag
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ROOT-llvm13-20230704-01
ROOT-llvm13-20230707-01