Fix a few problems in tuple codegen code. Fix #5069

Refs #5108
JuliaLang · Dec 12, 2013 · c5364db · c5364db
1 parent 163fb01
commit c5364db
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/src/cgutils.cpp b/src/cgutils.cpp
@@ -62,6 +62,8 @@ static Value *literal_pointer_val(void *p)
 
 static Type *julia_struct_to_llvm(jl_value_t *jt);
 
+static bool jltupleisbits(jl_value_t *jt, bool allow_unsized = true);
+
 static Type *julia_type_to_llvm(jl_value_t *jt)
 {
     if (jt == (jl_value_t*)jl_bool_type) return T_int1;
@@ -76,7 +78,7 @@ static Type *julia_type_to_llvm(jl_value_t *jt)
         Type *type = NULL;
         for (size_t i = 0; i < ntypes; ++i) {
             jl_value_t *elt = jl_tupleref(jt,i);
-            purebits &= jl_isbits(elt);
+            purebits &= jltupleisbits(elt);
             Type *newtype = julia_struct_to_llvm(elt);
             if (type != NULL && type != newtype)
                 isvector = false;
@@ -91,7 +93,7 @@ static Type *julia_type_to_llvm(jl_value_t *jt)
                 Type *ret = NULL;
                 if (type == T_void)
                     return T_void;
-                if (type->isSingleValueType())
+                if (type->isSingleValueType() && !type->isVectorTy())
                     ret = VectorType::get(type,ntypes);
                 else
                     ret = ArrayType::get(type,ntypes);

diff --git a/src/codegen.cpp b/src/codegen.cpp
@@ -852,7 +852,7 @@ static bool is_getfield_nonallocating(jl_datatype_t *ty, jl_value_t *fld)
     return true;
 }
 
-static bool jltupleisbits(jl_value_t *jt, bool allow_unsized = true)
+static bool jltupleisbits(jl_value_t *jt, bool allow_unsized)
 {
     if (!jl_is_tuple(jt))
         return jl_isbits(jt) && (allow_unsized || 
@@ -2470,7 +2470,8 @@ static Value *alloc_local(jl_sym_t *s, jl_codectx_t *ctx)
     jl_value_t *jt = vi.declType;
     Value *lv = NULL;
     assert(store_unboxed_p(s,ctx));
-    Type *vtype = julia_type_to_llvm(jt);
+    Type *vtype = julia_struct_to_llvm(jt);
+    assert(vtype != jl_pvalue_llvmt);
     if (vtype != T_void) {
         lv = builder.CreateAlloca(vtype, 0, s->name);
         if (vtype != jl_pvalue_llvmt)

diff --git a/src/intrinsics.cpp b/src/intrinsics.cpp
@@ -222,7 +222,7 @@ static Value *emit_unbox(Type *to, Value *x, jl_value_t *jt)
             if (ety == T_void)
                 continue;
             Value *ref = emit_tupleref(x,ConstantInt::get(T_size,i+1),jt,NULL);
-            Value *elt = emit_unbox(ety,ref,julia_type_of(ref));
+            Value *elt = emit_unbox(ety,ref,jl_tupleref(jt,i));
             tpl = emit_tupleset(tpl,ConstantInt::get(T_size,i+1),elt,jt,NULL);
         }
         return tpl;