fix regression in --compile=all function caused by improved ccall err…

…or message
JuliaLang · Oct 5, 2015 · 592620f · 592620f
1 parent 02748d1
commit 592620f
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/src/ccall.cpp b/src/ccall.cpp
@@ -1006,15 +1006,16 @@ static jl_cgval_t emit_ccall(jl_value_t **args, size_t nargs, jl_codectx_t *ctx)
                     static_rt = true;
                 }
             }
-            if (jl_exception_in_transit && jl_typeis(jl_exception_in_transit,
-                                                     jl_undefvarerror_type)) {
-                std::string msg = "ccall return type undefined: " +
-                                  std::string(((jl_sym_t*)args[2])->name );
-                emit_error(msg.c_str(), ctx);
-                JL_GC_POP();
-                return jl_cgval_t();
-            }
             if (rt == NULL) {
+                if (jl_exception_in_transit && jl_typeis(jl_exception_in_transit,
+                                                         jl_undefvarerror_type)
+                                            && jl_is_symbol(args[2])) {
+                    std::string msg = "ccall return type undefined: " +
+                                      std::string(((jl_sym_t*)args[2])->name);
+                    emit_error(msg.c_str(), ctx);
+                    JL_GC_POP();
+                    return jl_cgval_t();
+                }
                 emit_error("error interpreting ccall return type", ctx);
                 JL_GC_POP();
                 return jl_cgval_t();