diff options
author | Vlad Ureche <vlad.ureche@epfl.ch> | 2015-01-16 15:39:39 +0100 |
---|---|---|
committer | Vlad Ureche <vlad.ureche@epfl.ch> | 2015-01-16 15:39:39 +0100 |
commit | d395e52eb1aad201746d978e31a350756d846614 (patch) | |
tree | 4ba759d8f857b05c5388ff91a0017515d460a9d5 | |
parent | 3d76836bc81c3ec183e83ee186e447ff212507d0 (diff) | |
parent | 70ed23d58f9dd2d198250d2a889b60c88e39f59a (diff) | |
download | scala-d395e52eb1aad201746d978e31a350756d846614.tar.gz scala-d395e52eb1aad201746d978e31a350756d846614.tar.bz2 scala-d395e52eb1aad201746d978e31a350756d846614.zip |
Merge pull request #4249 from retronym/ticket/9089
SI-9089 Another REPL/FSC + specialization bug fix
-rw-r--r-- | src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala | 1 | ||||
-rw-r--r-- | test/files/res/t9089.check | 4 | ||||
-rw-r--r-- | test/files/res/t9089.res | 2 | ||||
-rw-r--r-- | test/files/res/t9089/A.scala | 1 |
4 files changed, 7 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala b/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala index c86a1108b2..1691b01e3e 100644 --- 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 new file mode 100644 index 0000000000..6cf64f734b --- /dev/null +++ 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 new file mode 100644 index 0000000000..ab5cc8534d --- /dev/null +++ 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 new file mode 100644 index 0000000000..bccf269639 --- /dev/null +++ b/test/files/res/t9089/A.scala @@ -0,0 +1 @@ +object O { def f(x: => Int): Int = x } |