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

Patch to further fix building julia with llvm-svn #22015

Merged
merged 2 commits into from
May 23, 2017

Conversation

ranjanan
Copy link
Contributor

@ranjanan ranjanan commented May 22, 2017

Fixes #21720 (comment) but still doesn't fix the DICompile issue in #21879 (Credits: @Keno)

@@ -107,15 +107,22 @@ static void ensure_enter_function(Module &M)
}

bool LowerExcHandlers::doInitialization(Module &M) {
auto T_pint8 = Type::getInt8PtrTy(M.getContext(), 0)
Copy link
Contributor

Choose a reason for hiding this comment

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

Missing semicolon and wierd indent...

Copy link
Member

Choose a reason for hiding this comment

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

Can also go into the if JL_LLVM_VERSION block below.

@ararslan ararslan added building Build system, or building Julia or its dependencies external dependencies Involves LLVM, OpenBLAS, or other linked libraries labels May 22, 2017
@@ -107,15 +107,22 @@ static void ensure_enter_function(Module &M)
}

bool LowerExcHandlers::doInitialization(Module &M) {
auto T_pint8 = Type::getInt8PtrTy(M.getContext(), 0)
Copy link
Member

Choose a reason for hiding this comment

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

Can also go into the if JL_LLVM_VERSION block below.

lifetime_end = Intrinsic::getDeclaration(&M, Intrinsic::lifetime_end);

#if JL_LLVM_VERSION >= 50000
auto lifetime_start = Intrinsic::getDeclaration(&M, Intrinsic::lifetime_start, { T_pint8 });
Copy link
Member

Choose a reason for hiding this comment

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

Drop the auto.

@Keno Keno merged commit 0506394 into JuliaLang:master May 23, 2017
@ranjanan ranjanan deleted the RA/llvm-svn branch May 23, 2017 14:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
building Build system, or building Julia or its dependencies external dependencies Involves LLVM, OpenBLAS, or other linked libraries
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants