@@ -555,7 +555,6 @@ class jl_codectx_t {
555
555
Value *argCount = NULL ;
556
556
std::string funcName;
557
557
int vaSlot = -1 ; // name of vararg argument
558
- bool vaStack = false ; // varargs stack-allocated
559
558
bool has_sret = false ;
560
559
int nReqArgs = 0 ;
561
560
int nargs = 0 ;
@@ -2337,7 +2336,7 @@ static bool emit_builtin_call(jl_codectx_t &ctx, jl_cgval_t *ret, jl_value_t *f,
2337
2336
}
2338
2337
2339
2338
else if (f == jl_builtin__apply && nargs == 2 && ctx.vaSlot > 0 ) {
2340
- // turn Core._apply(f, Tuple) ==> f(Tuple...) using the jlcall calling convention if Tuple is the vaStack allocation
2339
+ // turn Core._apply(f, Tuple) ==> f(Tuple...) using the jlcall calling convention if Tuple is the va allocation
2341
2340
if (LoadInst *load = dyn_cast_or_null<LoadInst>(argv[2 ].V )) {
2342
2341
if (load->getPointerOperand () == ctx.slots [ctx.vaSlot ].boxroot ) {
2343
2342
Value *theF = maybe_decay_untracked (boxed (ctx, argv[1 ]));
@@ -3267,7 +3266,6 @@ static jl_cgval_t emit_local(jl_codectx_t &ctx, jl_value_t *slotload)
3267
3266
{
3268
3267
size_t sl = jl_slot_number (slotload) - 1 ;
3269
3268
jl_varinfo_t &vi = ctx.slots [sl];
3270
- assert (!(ctx.vaStack && (int )sl == ctx.vaSlot && " error in escape analysis" ));
3271
3269
jl_sym_t *sym = slot_symbol (ctx, sl);
3272
3270
jl_value_t *typ;
3273
3271
if (jl_typeis (slotload, jl_typedslot_type)) {
@@ -4760,7 +4758,6 @@ static std::unique_ptr<Module> emit_function(
4760
4758
ctx.world = world;
4761
4759
ctx.name = jl_symbol_name (jl_is_method (lam->def .method ) ? lam->def .method ->name : anonymous_sym);
4762
4760
ctx.funcName = ctx.name ;
4763
- ctx.vaStack = false ;
4764
4761
ctx.params = params;
4765
4762
ctx.spvals_ptr = NULL ;
4766
4763
ctx.nargs = jl_is_method (lam->def .method ) ? lam->def .method ->nargs : 0 ;
0 commit comments