fix a bug preventing inlining of getindex of const globals (#35239)

JuliaLang · Mar 25, 2020 · 1f78749 · 1f78749 · nanosoldier · Mar 25, 2020
1 parent f449765
commit 1f78749
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/base/compiler/optimize.jl b/base/compiler/optimize.jl
@@ -280,7 +280,7 @@ intrinsic_effect_free_if_nothrow(f) = f === Intrinsics.pointerref || is_pure_int
 plus_saturate(x::Int, y::Int) = max(x, y, x+y)
 
 # known return type
-isknowntype(@nospecialize T) = (T === Union{}) || isconcretetype(T)
+isknowntype(@nospecialize T) = (T === Union{}) || isa(T, Const) || isconcretetype(widenconst(T))
 
 function statement_cost(ex::Expr, line::Int, src::CodeInfo, sptypes::Vector{Any}, slottypes::Vector{Any}, params::Params)
     head = ex.head

diff --git a/test/compiler/inline.jl b/test/compiler/inline.jl
@@ -282,3 +282,9 @@ end
     @test ccall(:jl_ast_flag_inlineable, Bool, (Any,), first(methods(@inline function f(x) x end)).source)
     @test !ccall(:jl_ast_flag_inlineable, Bool, (Any,), first(methods(function f(x) x end)).source)
 end
+
+const _a_global_array = [1]
+f_inline_global_getindex() = _a_global_array[1]
+let ci = code_typed(f_inline_global_getindex, Tuple{})[1].first
+    @test any(x->(isexpr(x, :call) && x.args[1] === GlobalRef(Base, :arrayref)), ci.code)
+end