improve some method signatures

base/compiler/optimize.jl

@@ -66,8 +66,6 @@ function OptimizationState(linfo::MethodInstance, params::Params)
  return OptimizationState(linfo, src, params)
 end
 
-include("compiler/ssair/driver.jl")
-
 _topmod(sv::OptimizationState) = _topmod(sv.mod)
 
 function update_valid_age!(min_valid::UInt, max_valid::UInt, sv::OptimizationState)
@@ -343,17 +341,15 @@ function finish(me::InferenceState)
  nothing
 end
 
-function maybe_widen_conditional(vt)
- if isa(vt, Conditional)
- if vt.vtype === Bottom
- vt = Const(false)
- elseif vt.elsetype === Bottom
- vt = Const(true)
- else
- vt = Bool
- end
+maybe_widen_conditional(@nospecialize vt) = vt
+function maybe_widen_conditional(vt::Conditional)
+ if vt.vtype === Bottom
+ Const(false)
+ elseif vt.elsetype === Bottom
+ Const(true)
+ else
+ Bool
  end
- vt
 end
 
 function annotate_slot_load!(e::Expr, vtypes::VarTable, sv::InferenceState, undefs::Array{Bool,1})
@@ -988,3 +984,5 @@ function return_type(@nospecialize(f), @nospecialize(t))
  end
  return rt
 end
+
+include("compiler/ssair/driver.jl")

base/compiler/ssair/inlining2.jl

@@ -577,8 +577,9 @@ function singleton_type(@nospecialize(ft))
  return nothing
 end
 
-function analyze_method!(idx, f, ft, metharg, methsp, method, stmt, atypes, sv, atype_unlimited, isinvoke, isapply, invoke_data,
- stmttyp)
+function analyze_method!(idx::Int, @nospecialize(f), @nospecialize(ft), @nospecialize(metharg), methsp::SimpleVector,
+ method::Method, stmt::Expr, atypes::Vector{Any}, sv::OptimizationState, @nospecialize(atype_unlimited),
+ isinvoke::Bool, isapply::Bool, invoke_data::Union{InvokeData,Nothing}, @nospecialize(stmttyp))
  methsig = method.sig
 
  # Check whether this call just evaluates to a constant