rebase fixup

JuliaLang · Jun 4, 2019 · 4309e03 · 4309e03
1 parent 5011e40
commit 4309e03
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/base/compiler/inferencestate.jl b/base/compiler/inferencestate.jl
@@ -88,7 +88,7 @@ mutable struct InferenceState
         end
 
         min_valid = src.min_world
-        max_valid = src.max_world == (typemax(UInt)%Int) ?
+        max_valid = src.max_world == typemax(UInt) ?
             get_world_counter() : src.max_world
         frame = new(
             params, result, linfo,

diff --git a/src/jltypes.c b/src/jltypes.c
@@ -2088,7 +2088,7 @@ void jl_init_types(void) JL_GC_DISABLED
                             "inlineable",
                             "propagate_inbounds",
                             "pure"),
-                        jl_svec(17,
+                        jl_svec(18,
                             jl_array_any_type,
                             jl_any_type,
                             jl_any_type,