Merge b9c18a2 into d28a7d5

JuliaLang · Sep 19, 2018 · d10df6c · d10df6c
2 parents d28a7d5 + b9c18a2
commit d10df6c
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/base/compiler/optimize.jl b/base/compiler/optimize.jl
@@ -230,15 +230,19 @@ function optimize(opt::OptimizationState, @nospecialize(result))
     if force_noinline
         opt.src.inlineable = false
     elseif isa(def, Method)
-        bonus = 0
-        if result ⊑ Tuple && !isbitstype(widenconst(result))
-            bonus = opt.params.inline_tupleret_bonus
-        end
-        if opt.src.inlineable
-            # For functions declared @inline, increase the cost threshold 20x
-            bonus += opt.params.inline_cost_threshold*19
+        if opt.src.inlineable && isdispatchtuple(opt.linfo.specTypes)
+            # obey @inline declaration if a dispatch barrier would not help
+        else
+            bonus = 0
+            if result ⊑ Tuple && !isbitstype(widenconst(result))
+                bonus = opt.params.inline_tupleret_bonus
+            end
+            if opt.src.inlineable
+                # For functions declared @inline, increase the cost threshold 20x
+                bonus += opt.params.inline_cost_threshold*19
+            end
+            opt.src.inlineable = isinlineable(def, opt, bonus)
         end
-        opt.src.inlineable = isinlineable(def, opt, bonus)
     end
     nothing
 end