Skip to content

Commit

Permalink
Merge pull request #26860 from JuliaLang/tb/hotfix
Browse files Browse the repository at this point in the history
Fix compilation on LLVM 6.0
  • Loading branch information
vchuravy committed Apr 20, 2018
2 parents adab472 + 0dbab6f commit 8926889
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/llvm-late-gc-lowering.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1750,7 +1750,7 @@ bool LateLowerGCFrame::CleanupIR(Function &F, State *S) {
NewCall->setAttributes(attr);
#endif
#if JL_LLVM_VERSION >= 40000
NewCall->copyMetadata(CI);
NewCall->copyMetadata(*CI);
#else
SmallVector<std::pair<unsigned, MDNode *>, 1> MDs;
CI->getAllMetadata(MDs);
Expand All @@ -1767,7 +1767,7 @@ bool LateLowerGCFrame::CleanupIR(Function &F, State *S) {
CallInst *NewCall = CallInst::Create(CI, None, CI);
NewCall->takeName(CI);
#if JL_LLVM_VERSION >= 40000
NewCall->copyMetadata(CI);
NewCall->copyMetadata(*CI);
#else
SmallVector<std::pair<unsigned, MDNode *>, 1> MDs;
CI->getAllMetadata(MDs);
Expand Down

2 comments on commit 8926889

@nanosoldier
Copy link
Collaborator

Choose a reason for hiding this comment

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

Executing the daily benchmark build, I will reply here when finished:

@nanosoldier runbenchmarks(ALL, isdaily = true)

@nanosoldier
Copy link
Collaborator

Choose a reason for hiding this comment

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

Your benchmark job has completed - possible performance regressions were detected. A full report can be found here. cc @ararslan

Please sign in to comment.