Merge pull request scala#4249 from retronym/ticket/9089

Vlad Ureche · Vlad Ureche · commit d395e52eb1aa · 2015-01-16T15:39:39.000+01:00
SI-9089 Another REPL/FSC + specialization bug fix
diff --git a/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala b/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala
@@ -894,7 +894,6 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers {
       }
 
       val specMember = subst(outerEnv)(specializedOverload(owner, sym, spec))
-      owner.info.decls.enter(specMember)
       typeEnv(specMember) = typeEnv(sym) ++ outerEnv ++ spec
       wasSpecializedForTypeVars(specMember) ++= spec collect { case (s, tp) if s.tpe == tp => s }
 
diff --git a/test/files/res/t9089.check b/test/files/res/t9089.check
@@ -0,0 +1,4 @@
+
+nsc> 
+nsc> 
+nsc> 
diff --git a/test/files/res/t9089.res b/test/files/res/t9089.res
@@ -0,0 +1,2 @@
+t9089/A.scala
+t9089/A.scala
diff --git a/test/files/res/t9089/A.scala b/test/files/res/t9089/A.scala
@@ -0,0 +1 @@
+object O { def f(x: => Int): Int = x }

Original file line number	Diff line number	Diff line change
`@@ -894,7 +894,6 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers {`
`894`	`894`	`}`
`895`	`895`
`896`	`896`	`val specMember = subst(outerEnv)(specializedOverload(owner, sym, spec))`
`897`		`- owner.info.decls.enter(specMember)`
`898`	`897`	`typeEnv(specMember) = typeEnv(sym) ++ outerEnv ++ spec`
`899`	`898`	`wasSpecializedForTypeVars(specMember) ++= spec collect { case (s, tp) if s.tpe == tp => s }`
`900`	`899`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
++
 +nsc>
 +nsc>
 +nsc>