Fix crash in Dict test

Fix the instance of assuming DataType that caused the
crash in array.c and audit other uses, inserting appropriate assertions.

Author: Keno

src/cgutils.cpp

@@ -212,6 +212,7 @@ static DIType julia_type_to_di(jl_value_t *jt, DIBuilder *dbuilder, bool isboxed
         return ct;
     }
     else {
+        assert(jl_is_datatype(jt));
         jdt->ditype = dbuilder->createTypedef(jl_pvalue_dillvmt,
             jl_symbol_name(jdt->name->name), NULL, 0, NULL);
         return (llvm::DIType*)jdt->ditype;

src/codegen.cpp

@@ -2750,6 +2750,7 @@ static bool emit_builtin_call(jl_cgval_t *ret, jl_value_t *f, jl_value_t **args,
                 sz = emit_datatype_nfields(boxed(arg1, ctx));
             }
             else {
+                assert(jl_is_datatype(aty));
                 sz = ConstantInt::get(T_size, jl_datatype_nfields(aty));
             }
             *ret = mark_julia_type(sz, false, jl_long_type, ctx);
@@ -2832,6 +2833,7 @@ static bool emit_builtin_call(jl_cgval_t *ret, jl_value_t *f, jl_value_t **args,
             JL_GC_POP();
             return false;
         }
+        assert(jl_is_datatype(stt));
 
         ssize_t fieldidx = -1;
         if (jl_is_quotenode(args[2]) && jl_is_symbol(jl_fieldref(args[2], 0))) {

src/jltypes.c

@@ -882,13 +882,18 @@ static jl_value_t *inst_datatype(jl_datatype_t *dt, jl_svec_t *p, jl_value_t **i
         size_t i;
         for(i=0; i < ntp; i++) {
             jl_value_t *pi = iparams[i];
-            if (!jl_is_leaf_type(pi) || ((jl_datatype_t*)pi)->abstract) {
-                // normalize types equal to wrappers
-                jl_value_t *tw = extract_wrapper(pi);
-                if (tw && tw != pi && jl_types_equal(pi, tw)) {
-                    iparams[i] = tw;
-                    if (p) jl_gc_wb(p, tw);
-                }
+            if (pi == jl_bottom_type)
+                continue;
+            if (jl_is_leaf_type(pi)) {
+                assert(jl_is_datatype(pi));
+                if (!((jl_datatype_t*)pi)->abstract)
+                    continue;
+            }
+            // normalize types equal to wrappers
+            jl_value_t *tw = extract_wrapper(pi);
+            if (tw && tw != pi && jl_types_equal(pi, tw)) {
+                iparams[i] = tw;
+                if (p) jl_gc_wb(p, tw);
             }
         }
         jl_value_t *lkup = (jl_value_t*)lookup_type(tn, iparams, ntp);