Skip to content
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.

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

Fix compilation with LLVM11 #3322

Closed
wants to merge 6 commits into from

Conversation

thewilsonator
Copy link
Contributor

No description provided.

@thewilsonator thewilsonator requested a review from kinke February 12, 2020 23:20
@JohanEngelen
Copy link
Member

Can you also add the usual LLVM upgrade things? FindLLVM.cmake, FileCheck, and profdata. See https://github.com/ldc-developers/ldc/pull/3323/files

@kinke
Copy link
Member

kinke commented Feb 15, 2020

[ldc.intrinsics isn't fit for LLVM 11 either. Btw, I don't mind adding FileCheck and profdata at the end of the LLVM release cycle, as a check whether it's still up-to-date shouldn't be forgotten.]

@thewilsonator
Copy link
Contributor Author

Added llvm config names. If kinke wants to do the intrinsics later, then this is good to go.

@@ -30,6 +30,8 @@ IRScope::IRScope() : builder(gIR->context()) { begin = nullptr; }

IRScope::IRScope(llvm::BasicBlock *b) : begin(b), builder(b) {}

IRScope::IRScope(const IRScope &other) : begin(other.begin), builder(begin) {}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

IRBuilder had its copy constructor deleted...

@@ -231,7 +231,7 @@ class ArrayFI : public TypeInfoFI {
}

Value *promote(CallSite CS, IRBuilder<> &B, const Analysis &A) override {
IRBuilder<> Builder = B;
IRBuilder<> &Builder(B);
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hence this change and the one below. I'm pretty sure this is not the right fix but I'm not sure what is.

Copy link
Member

Choose a reason for hiding this comment

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

If we don't make a copy, then we should just use B instead of adding a reference to it. By not making a copy, my guess is that the insertion point of B is changed after leaving this function, whereas previously the insertion point stayed the same?

@kinke kinke mentioned this pull request Aug 20, 2020
@kinke
Copy link
Member

kinke commented Sep 29, 2020

Superseded by #3546.

@kinke kinke closed this Sep 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants