next round of fixes

Author: JeffBezanson

base/markdown/Julia/interp.jl

@@ -41,11 +41,8 @@ toexpr(x) = x
 
 toexpr(xs::Vector{Any}) = Expr(:call, GlobalRef(Base,:vector_any), map(toexpr, xs)...)
 
-function deftoexpr(T)
+for T in Any[MD, Paragraph, Header, Link, Bold, Italic]
     @eval function toexpr(md::$T)
         Expr(:call, typeof(md), $(map(x->:(toexpr(md.$x)), fieldnames(T))...))
     end
 end
-
-map(deftoexpr, [MD, Paragraph, Header,
-                Link, Bold, Italic])

base/reducedim.jl

@@ -92,7 +92,7 @@ reducedim_initarray0{T}(A::AbstractArray, region, v0::T) = reducedim_initarray0(
 #
 # The current scheme is basically following Steven G. Johnson's original implementation
 #
-promote_union(T::Union) = promote_type(T.types...)
+promote_union(T::Union) = promote_type(promote_union(T.a), promote_union(T.b))
 promote_union(T) = T
 
 function reducedim_init{S}(f, op::typeof(+), A::AbstractArray{S}, region)
@@ -129,7 +129,7 @@ reducedim_init(f, op::typeof(|), A::AbstractArray, region) = reducedim_initarray
 # specialize to make initialization more efficient for common cases
 
 for (IT, RT) in ((CommonReduceResult, :(eltype(A))), (SmallSigned, :Int), (SmallUnsigned, :UInt))
-    T = Union{[AbstractArray{t} for t in IT.types]..., [AbstractArray{Complex{t}} for t in IT.types]...}
+    T = Union{[AbstractArray{t} for t in uniontypes(IT)]..., [AbstractArray{Complex{t}} for t in uniontypes(IT)]...}
     @eval begin
         reducedim_init(f::typeof(identity), op::typeof(+), A::$T, region) =
             reducedim_initarray(A, region, zero($RT))

src/builtins.c

@@ -1176,6 +1176,7 @@ void jl_init_primitives(void)
     add_builtin("TypeVar", (jl_value_t*)jl_tvar_type);
     add_builtin("UnionAll", (jl_value_t*)jl_unionall_type);
     add_builtin("Union", (jl_value_t*)jl_uniontype_type);
+    add_builtin("BottomType", (jl_value_t*)jl_bottomtype_type);
     add_builtin("Tuple", (jl_value_t*)jl_anytuple_type);
     add_builtin("Vararg", (jl_value_t*)jl_vararg_type);
     add_builtin("SimpleVector", (jl_value_t*)jl_simplevector_type);

src/dump.c

@@ -127,7 +127,7 @@ typedef struct {
 } jl_serializer_state;
 
 static jl_value_t *jl_idtable_type = NULL;
-static arraylist_t builtin_types;
+static arraylist_t builtin_typenames;
 
 #define write_uint8(s, n) ios_putc((n), (s))
 #define read_uint8(s) ((uint8_t)ios_getc(s))
@@ -2062,9 +2062,9 @@ static void jl_save_system_image_to_stream(ios_t *f)
     jl_prune_type_cache(jl_type_typename->cache);
 
     intptr_t i;
-    for (i = 0; i < builtin_types.len; i++) {
-        jl_serialize_value(&s, ((jl_datatype_t*)builtin_types.items[i])->name->cache);
-        jl_serialize_value(&s, ((jl_datatype_t*)builtin_types.items[i])->name->linearcache);
+    for (i = 0; i < builtin_typenames.len; i++) {
+        jl_serialize_value(&s, ((jl_typename_t*)builtin_typenames.items[i])->cache);
+        jl_serialize_value(&s, ((jl_typename_t*)builtin_typenames.items[i])->linearcache);
     }
 
     // ensure everything in deser_tag is reassociated with its GlobalValue
@@ -2164,8 +2164,8 @@ static void jl_restore_system_image_from_stream(ios_t *f)
     jl_module_type->name->mt = (jl_methtable_t*)jl_deserialize_value(&s, NULL);
 
     intptr_t i;
-    for(i=0; i < builtin_types.len; i++) {
-        jl_typename_t *tn = ((jl_datatype_t*)builtin_types.items[i])->name;
+    for(i=0; i < builtin_typenames.len; i++) {
+        jl_typename_t *tn = (jl_typename_t*)builtin_typenames.items[i];
         tn->cache = (jl_svec_t*)jl_deserialize_value(&s, NULL); jl_gc_wb(tn, tn->cache);
         tn->linearcache = (jl_svec_t*)jl_deserialize_value(&s, NULL); jl_gc_wb(tn, tn->linearcache);
         jl_resort_type_cache(tn->cache);
@@ -2654,7 +2654,7 @@ void jl_init_serializer(void)
                      jl_box_int32(33), jl_box_int32(34), jl_box_int32(35),
                      jl_box_int32(36), jl_box_int32(37), jl_box_int32(38),
                      jl_box_int32(39), jl_box_int32(40), jl_box_int32(41),
-                     jl_box_int32(42), jl_box_int32(43),
+                     jl_box_int32(42),
 #endif
                      jl_box_int64(0), jl_box_int64(1), jl_box_int64(2),
                      jl_box_int64(3), jl_box_int64(4), jl_box_int64(5),
@@ -2671,7 +2671,7 @@ void jl_init_serializer(void)
                      jl_box_int64(33), jl_box_int64(34), jl_box_int64(35),
                      jl_box_int64(36), jl_box_int64(37), jl_box_int64(38),
                      jl_box_int64(39), jl_box_int64(40), jl_box_int64(41),
-                     jl_box_int64(42), jl_box_int64(43),
+                     jl_box_int64(42),
 #endif
                      jl_labelnode_type, jl_linenumbernode_type, jl_gotonode_type,
                      jl_quotenode_type, jl_type_type, jl_bottom_type, jl_ref_type,
@@ -2683,7 +2683,7 @@ void jl_init_serializer(void)
                      jl_typemap_entry_type, jl_voidpointer_type, jl_newvarnode_type,
                      jl_array_symbol_type, jl_anytuple_type, jl_tparam0(jl_anytuple_type),
                      jl_typeof(jl_emptytuple), jl_array_uint8_type, jl_symbol_type->name,
-                     jl_ssavalue_type->name, jl_tuple_typename,
+                     jl_ssavalue_type->name, jl_tuple_typename, jl_bottomtype_type,
                      ((jl_datatype_t*)jl_unwrap_unionall(jl_ref_type))->name,
                      jl_pointer_typename, jl_simplevector_type->name, jl_datatype_type->name,
                      jl_uniontype_type->name, jl_array_typename, jl_expr_type->name,
@@ -2696,7 +2696,7 @@ void jl_init_serializer(void)
                      jl_abstractslot_type->name, jl_slotnumber_type->name, jl_unionall_type->name,
                      jl_intrinsic_type->name, jl_task_type->name, jl_labelnode_type->name,
                      jl_linenumbernode_type->name, jl_builtin_type->name, jl_gotonode_type->name,
-                     jl_quotenode_type->name, jl_globalref_type->name,
+                     jl_quotenode_type->name, jl_globalref_type->name, jl_bottomtype_type->name,
 
                      ptls->root_task,
 
@@ -2731,15 +2731,15 @@ void jl_init_serializer(void)
     }
     assert(i <= 256);
 
-    arraylist_new(&builtin_types, 0);
-    arraylist_push(&builtin_types, jl_array_type);
-    arraylist_push(&builtin_types, jl_ref_type);
-    arraylist_push(&builtin_types, jl_pointer_type);
-    arraylist_push(&builtin_types, jl_type_type);
-    arraylist_push(&builtin_types, jl_abstractarray_type);
-    arraylist_push(&builtin_types, jl_densearray_type);
-    arraylist_push(&builtin_types, jl_tuple_type);
-    arraylist_push(&builtin_types, jl_vararg_type);
+    arraylist_new(&builtin_typenames, 0);
+    arraylist_push(&builtin_typenames, jl_array_typename);
+    arraylist_push(&builtin_typenames, ((jl_datatype_t*)jl_ref_type->body)->name);
+    arraylist_push(&builtin_typenames, jl_pointer_typename);
+    arraylist_push(&builtin_typenames, jl_type_typename);
+    arraylist_push(&builtin_typenames, ((jl_datatype_t*)jl_unwrap_unionall(jl_abstractarray_type))->name);
+    arraylist_push(&builtin_typenames, ((jl_datatype_t*)jl_unwrap_unionall(jl_densearray_type))->name);
+    arraylist_push(&builtin_typenames, jl_tuple_typename);
+    arraylist_push(&builtin_typenames, jl_vararg_typename);
 }
 
 #ifdef __cplusplus

src/gf.c

@@ -672,7 +672,8 @@ static jl_lambda_info_t *cache_method(jl_methtable_t *mt, union jl_typemap_t *ca
             jl_svecset(limited, i, jl_wrap_vararg(lasttype, (jl_value_t*)NULL));
         }
         else {
-            jl_value_t *lastdeclt = jl_tparam(decl, jl_nparams(decl) - 1);
+            jl_value_t *unw = jl_unwrap_unionall(decl);
+            jl_value_t *lastdeclt = jl_tparam(unw, jl_nparams(unw) - 1);
             int nsp = jl_svec_len(sparams);
             if (nsp > 0) {
                 jl_svec_t *env = jl_alloc_svec_uninit(2 * nsp);
@@ -1765,15 +1766,14 @@ void jl_precompile(int all) {
     jl_compile_specializations();
 }
 
-//
-
 #ifdef JL_TRACE
 static int trace_en = 0;
 static int error_en = 1;
 static void __attribute__ ((unused)) enable_trace(int x) { trace_en=x; }
 static void show_call(jl_value_t *F, jl_value_t **args, uint32_t nargs)
 {
-    jl_printf(JL_STDOUT, "%s(",  jl_symbol_name(jl_gf_name(F)));
+    jl_static_show(JL_STDOUT, F);
+    jl_printf(JL_STDOUT, "(");
     for(size_t i=0; i < nargs; i++) {
         if (i > 0) jl_printf(JL_STDOUT, ", ");
         jl_static_show(JL_STDOUT, jl_typeof(args[i]));
@@ -1926,7 +1926,7 @@ JL_DLLEXPORT jl_value_t *jl_apply_generic(jl_value_t **args, uint32_t nargs)
         if (mfunc == NULL) {
 #ifdef JL_TRACE
             if (error_en)
-                show_call(F, args, nargs);
+                show_call(args[0], args, nargs);
 #endif
             jl_method_error((jl_function_t*)args[0], args, nargs);
             // unreachable
@@ -1935,7 +1935,7 @@ JL_DLLEXPORT jl_value_t *jl_apply_generic(jl_value_t **args, uint32_t nargs)
 
 #ifdef JL_TRACE
     if (traceen)
-        jl_printf(JL_STDOUT, " at %s:%d\n", jl_symbol_name(mfunc->file), mfunc->line);
+        jl_printf(JL_STDOUT, " at %s:%d\n", jl_symbol_name(mfunc->def->file), mfunc->def->line);
 #endif
     jl_value_t *res = jl_call_method_internal(mfunc, args, nargs);
     return verify_type(res);

src/jltypes.c

@@ -2610,7 +2610,7 @@ static int jl_tuple_morespecific(jl_datatype_t *cdt, jl_datatype_t *pdt, int inv
         if (ci >= clenf && !cseq)
             return 1;
         if (pi >= plenf && !pseq)
-            return some_morespecific;
+            return 0;
         if (ci < clenr) {
             ce = child[ci];
             if (jl_is_vararg_type(ce)) ce = jl_unwrap_vararg(ce);
@@ -3359,7 +3359,7 @@ void jl_init_types(void)
     jl_void_type->instance = jl_nothing;
 
     jl_datatype_t *type_type = (jl_datatype_t*)jl_type_type;
-    jl_bottomtype_type = jl_new_datatype(jl_symbol("Bottom"), type_type, jl_emptysvec,
+    jl_bottomtype_type = jl_new_datatype(jl_symbol("BottomType"), type_type, jl_emptysvec,
                                          jl_emptysvec, jl_emptysvec, 0, 0, 0);
     jl_bottom_type = jl_new_struct(jl_bottomtype_type);
     jl_bottomtype_type->instance = jl_bottom_type;

src/julia-syntax.scm

@@ -341,12 +341,13 @@
                            ,body ,isstaged)
                   `(method ,name
                            (block
-                            ,@(map make-assignment temps (symbols->typevars names bounds))
+                            ,@(map (lambda (l r) (make-assignment l (replace-vars r renames)))
+                                   temps (symbols->typevars names bounds))
                             (call (core svec) (curly Tuple
-                                                    ,@(dots->vararg
-                                                       (map (lambda (ty)
-                                                              (replace-vars ty renames))
-                                                            types)))
+                                                     ,@(dots->vararg
+                                                        (map (lambda (ty)
+                                                               (replace-vars ty renames))
+                                                             types)))
                                   (call (core svec) ,@temps)))
                            ,body ,isstaged))))
         (if (and iscall (not (null? argl)))