Fixes for 32-bit

Author: mlechu

JuliaLowering/src/eval.jl

@@ -132,7 +132,7 @@ else
         conversions = [:(convert($t, $n)) for (t,n) in zip(fts, fns)]
 
         expected_fns = (:code, :debuginfo, :ssavaluetypes, :ssaflags, :slotnames, :slotflags, :slottypes, :rettype, :parent, :edges, :min_world, :max_world, :method_for_inference_limit_heuristics, :nargs, :propagate_inbounds, :has_fcall, :has_image_globalref, :nospecializeinfer, :isva, :inlining, :constprop, :purity, :inlining_cost)
-        expected_fts = (Vector{Any}, Core.DebugInfo, Any, Vector{UInt32}, Vector{Symbol}, Vector{UInt8}, Any, Any, Any, Any, UInt64, UInt64, Any, UInt64, Bool, Bool, Bool, Bool, Bool, UInt8, UInt8, UInt16, UInt16)
+        expected_fts = (Vector{Any}, Core.DebugInfo, Any, Vector{UInt32}, Vector{Symbol}, Vector{UInt8}, Any, Any, Any, Any, UInt, UInt, Any, UInt, Bool, Bool, Bool, Bool, Bool, UInt8, UInt8, UInt16, UInt16)
 
         code = if fns != expected_fns
             unexpected_fns = collect(setdiff(Set(fns), Set(expected_fns)))

JuliaLowering/src/hooks.jl

@@ -13,7 +13,7 @@ function core_lowering_hook(@nospecialize(code), mod::Module,
 
     # TODO: fix in base
     file = file isa Ptr{UInt8} ? unsafe_string(file) : file
-    line = !(line isa Int64) ? Int64(line) : line
+    line = !(line isa Int) ? Int(line) : line
 
     local st0 = nothing
     try

JuliaLowering/test/misc.jl

@@ -176,7 +176,7 @@ end
     jeval(test_mod, "\"docstr12\" f12(x::Int, y::U, z::T=1) where {T, U<:Number}")
     d = jeval(test_mod, "@doc f12")
     @test d |> string === "docstr12\n"
-    @test d.meta[:results][1].data[:typesig] === Union{Tuple{Int64, U, T}, Tuple{Int64, U}} where {T, U<:Number}
+    @test d.meta[:results][1].data[:typesig] === Union{Tuple{Int, U, T}, Tuple{Int, U}} where {T, U<:Number}
 
 end