Merge pull request #12676 from JuliaLang/jn/compile_all_fixes2

more fixes for --compile=all

Author: vtjnash

src/codegen.cpp

@@ -3889,6 +3889,8 @@ static Function *emit_function(jl_lambda_info_t *lam)
     size_t captvinfoslen = jl_array_dim0(captvinfos);
     size_t nreq = largslen;
     int va = 0;
+    if (!lam->specTypes)
+        lam->specTypes = jl_anytuple_type;
     if (nreq > 0 && jl_is_rest_arg(jl_cellref(largs,nreq-1))) {
         nreq--;
         va = 1;
@@ -3955,7 +3957,7 @@ static Function *emit_function(jl_lambda_info_t *lam)
     Function *f = NULL;
 
     bool specsig = false;
-    if (!va && !hasCapt && lam->specTypes != NULL && lam->inferred) {
+    if (!va && !hasCapt && lam->specTypes != jl_anytuple_type && lam->inferred) {
         // no captured vars and not vararg
         // consider specialized signature
         for(size_t i=0; i < jl_nparams(lam->specTypes); i++) {
@@ -4416,37 +4418,30 @@ static Function *emit_function(jl_lambda_info_t *lam)
     }
 
     // step 11. check arg count
-    if (ctx.linfo->specTypes == NULL) {
+    if (jl_is_va_tuple(ctx.linfo->specTypes)) {
+        std::string msg;
+        Value *enough;
         if (va) {
-            Value *enough =
-                builder.CreateICmpUGE(argCount,
+            msg = "too few arguments";
+            enough = builder.CreateICmpUGE(argCount,
                                       ConstantInt::get(T_int32, nreq));
-            BasicBlock *elseBB =
-                BasicBlock::Create(getGlobalContext(), "else", f);
-            BasicBlock *mergeBB =
-                BasicBlock::Create(getGlobalContext(), "ifcont");
-            builder.CreateCondBr(enough, mergeBB, elseBB);
-            builder.SetInsertPoint(elseBB);
-            just_emit_error("too few arguments", &ctx);
-            builder.CreateUnreachable();
-            f->getBasicBlockList().push_back(mergeBB);
-            builder.SetInsertPoint(mergeBB);
         }
         else {
-            Value *enough =
+            msg = "wrong number of arguments";
+            enough =
                 builder.CreateICmpEQ(argCount,
                                      ConstantInt::get(T_int32, nreq));
-            BasicBlock *elseBB =
-                BasicBlock::Create(getGlobalContext(), "else", f);
-            BasicBlock *mergeBB =
-                BasicBlock::Create(getGlobalContext(), "ifcont");
-            builder.CreateCondBr(enough, mergeBB, elseBB);
-            builder.SetInsertPoint(elseBB);
-            just_emit_error("wrong number of arguments", &ctx);
-            builder.CreateUnreachable();
-            f->getBasicBlockList().push_back(mergeBB);
-            builder.SetInsertPoint(mergeBB);
         }
+        BasicBlock *elseBB =
+            BasicBlock::Create(getGlobalContext(), "else", f);
+        BasicBlock *mergeBB =
+            BasicBlock::Create(getGlobalContext(), "ifcont");
+        builder.CreateCondBr(enough, mergeBB, elseBB);
+        builder.SetInsertPoint(elseBB);
+        just_emit_error(msg, &ctx);
+        builder.CreateUnreachable();
+        f->getBasicBlockList().push_back(mergeBB);
+        builder.SetInsertPoint(mergeBB);
     }
 
     // step 12. move args into local variables

src/gf.c

@@ -1499,16 +1499,16 @@ static void all_p2c(jl_value_t *ast, jl_svec_t *tvars)
 
 static void precompile_unspecialized(jl_function_t *func, jl_tupletype_t *sig, jl_svec_t *tvars)
 {
+    assert(sig);
     func->linfo->specTypes = sig;
-    if (sig)
-        jl_gc_wb(func->linfo, sig);
+    jl_gc_wb(func->linfo, sig);
     if (tvars != jl_emptysvec) {
         // add static parameter names to end of closure env; compile
         // assuming they are there. method cache will fill them in when
         // it constructs closures for new "specializations".
         all_p2c((jl_value_t*)func->linfo, tvars);
     }
-    jl_trampoline_compile_function(func, 1, sig ? sig : jl_anytuple_type);
+    jl_trampoline_compile_function(func, 1, sig);
 }
 
 void jl_compile_all_defs(jl_function_t *gf)
@@ -1576,7 +1576,7 @@ static void _compile_all(jl_module_t *m, htable_t *h)
                     li->unspecialized = func;
                     jl_gc_wb(li, func);
                 }
-                precompile_unspecialized(func, NULL, jl_emptysvec);
+                precompile_unspecialized(func, li->specTypes ? li->specTypes : jl_anytuple_type, jl_emptysvec);
             }
         }
     }