summaryrefslogtreecommitdiff
path: root/test/files/run/t3452b-bcode
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2014-02-15 14:33:31 +0100
committerJason Zaugg <jzaugg@gmail.com>2014-02-15 14:33:31 +0100
commit653c404d7f1307251625a5569d53421d27f248cf (patch)
tree97e574c53464e12ae741214ea428cead2c9bc2d6 /test/files/run/t3452b-bcode
parentc7a5aab0d34243bfec9de2882594927b460b1ec9 (diff)
downloadscala-653c404d7f1307251625a5569d53421d27f248cf.tar.gz
scala-653c404d7f1307251625a5569d53421d27f248cf.tar.bz2
scala-653c404d7f1307251625a5569d53421d27f248cf.zip
SI-3452 GenBCode version of the static-forwarder signature fix
Shares the code with the GenASM version of the fix.
Diffstat (limited to 'test/files/run/t3452b-bcode')
-rw-r--r--test/files/run/t3452b-bcode/J_2.java6
-rw-r--r--test/files/run/t3452b-bcode/S_1.scala17
-rw-r--r--test/files/run/t3452b-bcode/S_3.scala5
3 files changed, 28 insertions, 0 deletions
diff --git a/test/files/run/t3452b-bcode/J_2.java b/test/files/run/t3452b-bcode/J_2.java
new file mode 100644
index 0000000000..839f334508
--- /dev/null
+++ b/test/files/run/t3452b-bcode/J_2.java
@@ -0,0 +1,6 @@
+public class J_2 {
+ public static void j() {
+ StringSearch.search("test");
+ StringSearch.searchC("test");
+ }
+}
diff --git a/test/files/run/t3452b-bcode/S_1.scala b/test/files/run/t3452b-bcode/S_1.scala
new file mode 100644
index 0000000000..a209f12035
--- /dev/null
+++ b/test/files/run/t3452b-bcode/S_1.scala
@@ -0,0 +1,17 @@
+trait Search[M] {
+ def search(input: M): C[Int] = {
+ println("Search received: " + input)
+ null
+ }
+}
+
+class SearchC[M] {
+ def searchC(input: M): C[Int] = {
+ println("SearchC received: " + input)
+ null
+ }
+}
+
+object StringSearch extends SearchC[String] with Search[String]
+
+trait C[T]
diff --git a/test/files/run/t3452b-bcode/S_3.scala b/test/files/run/t3452b-bcode/S_3.scala
new file mode 100644
index 0000000000..102b433f47
--- /dev/null
+++ b/test/files/run/t3452b-bcode/S_3.scala
@@ -0,0 +1,5 @@
+object Test {
+ def main(args: Array[String]): Unit = {
+ J_2.j()
+ }
+}