Fix a rebase conflict

JuliaLang · Nov 29, 2013 · d5ad8e6 · d5ad8e6
1 parent a7d99e6
commit d5ad8e6
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/ccall.cpp b/src/ccall.cpp
@@ -800,16 +800,14 @@ static Value *emit_ccall(jl_value_t **args, size_t nargs, jl_codectx_t *ctx)
             arg = emit_unboxed(argi, ctx);
             if (jl_is_bitstype(expr_type(argi, ctx))) {
                 Type *at = arg->getType();
+                Type *totype = addressOf ? largty->getContainedType(0) : largty;
                 if (at != jl_pvalue_llvmt && at != totype &&
                     !(at->isPointerTy() && jargty==(jl_value_t*)jl_voidpointer_type)) {
                     emit_type_error(arg, jargty, "ccall", ctx);
                     arg = UndefValue::get(totype);
                 }
                 else {
-                    if (addressOf)
-                        arg = emit_unbox(largty->getContainedType(0), arg, jargty);
-                    else
-                        arg = emit_unbox(largty, arg, jargty);
+                    arg = emit_unbox(totype, arg, jargty);
                 }
             }
         }