Drop support for LLVM <= 3.9.1 #22401
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
As of the merge of #21888, we no longer support building on LLVM <= 3.9.1. This is essentialyl the mechanical cleanup to rip out all code that we had to support building on older LLVM versions. There may still be some residual support left in places and of course some things can now be cleaned up further, but this should get us started.
ararslan
reviewed
Jun 17, 2017
| @@ -1136,20 +1101,14 @@ static jl_cgval_t emit_llvmcall(jl_value_t **args, size_t nargs, jl_codectx_t *c | |||
| it != argtypes.end(); ++it, ++i) | |||
| assert(*it == f->getFunctionType()->getParamType(i)); | |||
|
|
|||
| #ifdef USE_MCJIT | |||
There was a problem hiding this comment.
Are we assuming MCJIT now rather than ORC?
There was a problem hiding this comment.
USE_MCJIT is always defined for USE_ORCJIT.
There was a problem hiding this comment.
Yes, the default use to be the very old (3.3) JIT. Now MCJIT is the default.
There was a problem hiding this comment.
Ah, thanks for the explanation. Didn't know.
tkelman
reviewed
Jun 17, 2017
| @@ -583,8 +583,7 @@ static int NoteSafepoint(State &S, BBState &BBS, CallInst *CI) { | |||
| } | |||
|
|
|||
| void LateLowerGCFrame::NoteUse(State &S, BBState &BBS, Value *V, BitVector &Uses) { | |||
| // Short circuit to have to avoid dealing specially with vectors of | |||
| // constants, etc. | |||
| // Short circuit to avoid having to dealing with vectors of constants, etc. | |||
|
not yet addressed: |
|
I typo'd here. This drops support for < 3.9.1 or <= 3.9.0 |
|
also delete old patches and build system code for these old versions? |
vtjnash
reviewed
Jun 17, 2017
| @@ -4842,16 +4611,12 @@ static Function *gen_cfun_wrapper(jl_function_t *ff, jl_value_t *jlrettype, jl_t | |||
| } | |||
| (void)at; | |||
| } | |||
| Value *argn = builder.CreateConstInBoundsGEP1_32(LLVM37_param(NULL) myargs, i); | |||
| Value *argn = builder.CreateConstInBoundsGEP1_32(NULL, myargs, i); | |||
vtjnash
reviewed
Jun 17, 2017
| @@ -4710,7 +4487,7 @@ static Function *gen_cfun_wrapper(jl_function_t *ff, jl_value_t *jlrettype, jl_t | |||
| // for jlcall, we need to pass the function object even if it is a ghost. | |||
| // here we reconstruct the function instance from its type (first elt of argt) | |||
| Value *theF = literal_pointer_val((jl_value_t*)ff); | |||
| GetElementPtrInst *slot = GetElementPtrInst::Create(LLVM37_param(NULL) myargs, | |||
| GetElementPtrInst *slot = GetElementPtrInst::Create(NULL, myargs, | |||
| @@ -4725,22 +4502,14 @@ static Function *gen_cfun_wrapper(jl_function_t *ff, jl_value_t *jlrettype, jl_t | |||
| builder.CreateCondBr(age_ok, b_jlcall, b_generic); | |||
| builder.SetInsertPoint(b_jlcall); | |||
| Value *nargs_v = ConstantInt::get(T_int32, nargs); | |||
| Value *myargs1 = builder.CreateConstInBoundsGEP1_32(LLVM37_param(NULL) myargs, 1); | |||
| #if JL_LLVM_VERSION >= 30700 | |||
| Value *myargs1 = builder.CreateConstInBoundsGEP1_32(NULL, myargs, 1); | |||
| @@ -4628,7 +4407,7 @@ static Function *gen_cfun_wrapper(jl_function_t *ff, jl_value_t *jlrettype, jl_t | |||
| // figure out how to repack this type | |||
| if (!specsig) { | |||
| Value *arg = boxed(inputarg, &ctx, false); // don't want a gcroot, since it's about to be put into the jlcall frame anyways | |||
| GetElementPtrInst *slot = GetElementPtrInst::Create(LLVM37_param(NULL) myargs, | |||
| GetElementPtrInst *slot = GetElementPtrInst::Create(NULL, myargs, | |||
|
Since this touches so much code, I'll go ahead and merge this and do follow-up cleanups in a separate PR to avoid having to rebase. |
quinnj
pushed a commit
that referenced
this pull request
Jun 20, 2017
As of the merge of #21888, we no longer support building on LLVM <= 3.9.1. This is essentially the mechanical cleanup to rip out all code that we had to support building on older LLVM versions. There may still be some residual support left in places and of course some things can now be cleaned up further, but this should get us started.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As of the merge of #21888, we no longer support building on LLVM <= 3.9.1.
This is essentialyl the mechanical cleanup to rip out all code that
we had to support building on older LLVM versions. There may still be
some residual support left in places and of course some things can now
be cleaned up further, but this should get us started.