Merge pull request #1749 from paulp/pr/6595

Fix for SI-6595, lost modifiers in early defs.

2 files changed, 19 insertions, 0 deletions

diff --git a/test/files/pos/t6595.flags b/test/files/pos/t6595.flags
new file mode 100644
index 0000000000..85d8eb2ba2
--- /dev/null
+++ b/test/files/pos/t6595.flags
@@ -0,0 +1 @@
+-Xfatal-warnings
diff --git a/test/files/pos/t6595.scala b/test/files/pos/t6595.scala
new file mode 100644
index 0000000000..437c0bcf05
--- /dev/null
+++ b/test/files/pos/t6595.scala
@@ -0,0 +1,18 @@
+import scala.annotation.switch
+
+class Foo extends {
+  final val b0 = 5
+} with AnyRef {
+  final val b1 = 10
+
+  // Using the @switch annotation as a means of testing that the
+  // type inferred for b0 is Int(5) and not Int. Only in the former
+  // case can a switch be generated.
+  def f(p: Int) = (p: @switch) match {
+    case `b0` => 1
+    case `b1` => 2
+    case 15   => 3
+    case 20   => 4
+    case _    => 5
+  }
+}