From 0bb625b7823befafb170ef05f0493dd0a81a217a Mon Sep 17 00:00:00 2001
From: Martin Odersky <odersky@gmail.com>
Date: Tue, 30 Oct 2012 20:10:56 +0100
Subject: Fixes SI-6500 by making erasure more regular.

With the introduction of value classes, erasure uses specialErasure where a value class C with underlying type T is unboxed to an ErasedValueType. ErasedValue types are eliminated on phase later, in post-erasure. This was done everywhere, except in the parameter types of bridge methods. That was a mistale, because that way  bridge methods could not do the boxing/unboxing logic triggered by ErasedValueTypes.

Note: there is one remaining use of erasure (not specialErasure) in Erasure.scala. I put in a comment why that is OK.
---
 src/compiler/scala/tools/nsc/transform/Erasure.scala |  6 ++++--
 test/files/run/t6500.scala                           | 13 +++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 test/files/run/t6500.scala

diff --git a/src/compiler/scala/tools/nsc/transform/Erasure.scala b/src/compiler/scala/tools/nsc/transform/Erasure.scala
index 3ac7dd2a8f..a581c6d734 100644
--- a/src/compiler/scala/tools/nsc/transform/Erasure.scala
+++ b/src/compiler/scala/tools/nsc/transform/Erasure.scala
@@ -469,7 +469,7 @@ abstract class Erasure extends AddInterfaces
     }
 
     def checkPair(member: Symbol, other: Symbol) {
-      val otpe = erasure(root)(other.tpe)
+      val otpe = specialErasure(root)(other.tpe)
       val bridgeNeeded = afterErasure (
         !(other.tpe =:= member.tpe) &&
         !(deconstMap(other.tpe) =:= deconstMap(member.tpe)) &&
@@ -488,7 +488,7 @@ abstract class Erasure extends AddInterfaces
       debuglog("generating bridge from %s (%s): %s to %s: %s".format(
         other, flagsToString(newFlags),
         otpe + other.locationString, member,
-        erasure(root)(member.tpe) + member.locationString)
+        specialErasure(root)(member.tpe) + member.locationString)
       )
 
       // the parameter symbols need to have the new owner
@@ -1118,6 +1118,8 @@ abstract class Erasure extends AddInterfaces
               } else {
                 // store exact array erasure in map to be retrieved later when we might
                 // need to do the cast in adaptMember
+                // Note: No specialErasure needed here because we simply cast, on
+                // elimination of SelectFromArray, no boxing or unboxing is done there.
                 treeCopy.Apply(
                   tree,
                   SelectFromArray(qual, name, erasure(tree.symbol)(qual.tpe)).copyAttrs(fn),
diff --git a/test/files/run/t6500.scala b/test/files/run/t6500.scala
new file mode 100644
index 0000000000..03a68a3a24
--- /dev/null
+++ b/test/files/run/t6500.scala
@@ -0,0 +1,13 @@
+object Test extends App {
+  class Box(val value: Int) extends AnyVal
+
+  trait Foo {
+    def append(box: Box): Foo
+  }
+
+  class Bar extends Foo {
+    override def append(box: Box): Bar = this // produces bad forwarder
+  }
+
+  ((new Bar): Foo).append(new Box(0))
+}
-- 
cgit v1.2.3