summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@epfl.ch>2012-07-02 02:28:40 -0700
committerAdriaan Moors <adriaan.moors@epfl.ch>2012-07-02 02:28:40 -0700
commitd14d8178fa39961951d7dd74a37994db86a13063 (patch)
tree10c3bd0c18da7c2036d254f10e5e6e1e8b20146f /test/files
parent2d68576e91a0dc5a2a119ef2df68458a0e139ce3 (diff)
parentad51d8295388c02ca9160177aaba1b7e490eb5c2 (diff)
downloadscala-d14d8178fa39961951d7dd74a37994db86a13063.tar.gz
scala-d14d8178fa39961951d7dd74a37994db86a13063.tar.bz2
scala-d14d8178fa39961951d7dd74a37994db86a13063.zip
Merge pull request #802 from retronym/ticket/5489
SI-5489 Avoid accidentally adding members to Object in erasure.
Diffstat (limited to 'test/files')
-rw-r--r--test/files/res/t5489.check4
-rw-r--r--test/files/res/t5489.res2
-rw-r--r--test/files/res/t5489/t5489.scala14
3 files changed, 20 insertions, 0 deletions
diff --git a/test/files/res/t5489.check b/test/files/res/t5489.check
new file mode 100644
index 0000000000..6cf64f734b
--- /dev/null
+++ b/test/files/res/t5489.check
@@ -0,0 +1,4 @@
+
+nsc>
+nsc>
+nsc>
diff --git a/test/files/res/t5489.res b/test/files/res/t5489.res
new file mode 100644
index 0000000000..5b787b7765
--- /dev/null
+++ b/test/files/res/t5489.res
@@ -0,0 +1,2 @@
+t5489/t5489.scala
+t5489/t5489.scala \ No newline at end of file
diff --git a/test/files/res/t5489/t5489.scala b/test/files/res/t5489/t5489.scala
new file mode 100644
index 0000000000..f821a1a9b6
--- /dev/null
+++ b/test/files/res/t5489/t5489.scala
@@ -0,0 +1,14 @@
+package repro
+
+trait HasString {
+ def blerg(): String
+}
+
+class CausesProblems {
+ def problems = (
+ if ("don't optimize me away!".length == 0)
+ new HasString { def blerg() = "wut" }
+ else
+ new HasString { def blerg() = "okay" }
+ ).blerg()
+}