Fixed initial variable binding for method param...

Fixed initial variable binding for method parameters, that caused the
inliner to infer wrong types for tail recursive methods

1 files changed, 6 insertions, 0 deletions

diff --git a/src/compiler/scala/tools/nsc/backend/icode/analysis/TypeFlowAnalysis.scala b/src/compiler/scala/tools/nsc/backend/icode/analysis/TypeFlowAnalysis.scala
index 0dadd8980d..32a6037d41 100644
--- a/src/compiler/scala/tools/nsc/backend/icode/analysis/TypeFlowAnalysis.scala
+++ b/src/compiler/scala/tools/nsc/backend/icode/analysis/TypeFlowAnalysis.scala
@@ -126,6 +126,12 @@ abstract class TypeFlowAnalysis {
           in(b)  = typeFlowLattice.bottom
           out(b) = typeFlowLattice.bottom
         }
+
+        // start block has var bindings for each of its parameters
+        val entryBindings = new VarBinding
+        m.params.foreach(p => entryBindings += ((p, p.kind)))
+        in(m.code.startBlock) = lattice.IState(entryBindings, typeStackLattice.bottom)
+
         m.exh foreach { e =>
           in(e.startBlock) = lattice.IState(in(e.startBlock).vars, typeStackLattice.exceptionHandlerStack)
         }