Merge pull request #11905 from JuliaLang/kf/codegenbugs

Fix #11904 and also fix #11874
JuliaLang · Jun 28, 2015 · 070d356 · 070d356
2 parents 042f937 + 9abe7fe
commit 070d356
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/src/intrinsics.cpp b/src/intrinsics.cpp
@@ -265,7 +265,7 @@ static Value *emit_unbox(Type *to, Value *x, jl_value_t *jt)
         return UndefValue::get(to);
     }
     if (ty != jl_pvalue_llvmt) {
-        if (to->isAggregateType()) {
+        if (ty->isPointerTy() && to->isAggregateType()) {
             x = builder.CreateLoad(x); // something stack allocated
             ty = x->getType();
         }

diff --git a/test/core.jl b/test/core.jl
@@ -3033,3 +3033,30 @@ f11858(Any[Foo11858, Bar11858, g11858])
 @test g11858(1) == 1.0
 @test Foo11858(1).x == 1.0
 @test Bar11858(1).x == 1.0
+
+# issue 11904
+@noinline throw_error() = error()
+foo11904(x::Int) = x
+@inline function foo11904{S}(x::Nullable{S})
+    if isbits(S)
+        Nullable(foo11904(x.value), x.isnull)
+    else
+        throw_error()
+    end
+end
+
+@test !foo11904(Nullable(1)).isnull
+
+# issue 11874
+immutable Foo11874
+   x::Int
+end
+
+function bar11874(x)
+   y::Foo11874
+   y=x
+end
+
+Base.convert(::Type{Foo11874},x::Int) = float(x)
+
+@test_throws TypeError bar11874(1)