diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2015-03-24 14:16:52 +1000 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2015-03-24 14:16:52 +1000 |
commit | 4f05b1938c6343ea3f36dceada9f26a0b2b69a45 (patch) | |
tree | 14bb3fdf7887475492f7c0fa26ad42990c1bfc68 | |
parent | ee864c1d77ecbac354f4dae71b247a54d053fbdb (diff) | |
parent | 8a332d9e66ac2aa517b4eda33ff3a39159110fa0 (diff) | |
download | scala-4f05b1938c6343ea3f36dceada9f26a0b2b69a45.tar.gz scala-4f05b1938c6343ea3f36dceada9f26a0b2b69a45.tar.bz2 scala-4f05b1938c6343ea3f36dceada9f26a0b2b69a45.zip |
Merge pull request #4360 from retronym/ticket/9170
SI-9170 Fix resident compilation / specialization NPE
-rw-r--r-- | test/files/res/t9170.check | 7 | ||||
-rw-r--r-- | test/files/res/t9170.res | 2 | ||||
-rw-r--r-- | test/files/res/t9170/A.scala | 4 |
3 files changed, 13 insertions, 0 deletions
diff --git a/test/files/res/t9170.check b/test/files/res/t9170.check new file mode 100644 index 0000000000..6d40b6ba8d --- /dev/null +++ b/test/files/res/t9170.check @@ -0,0 +1,7 @@ + +nsc> t9170/A.scala:3: error: double definition: +def f[A](a: => A): Int at line 2 and +def f[A](a: => Either[Exception,A]): Int at line 3 +have same type after erasure: (a: Function0)Int + def f[A](a: => Either[Exception, A]) = 2 + ^ diff --git a/test/files/res/t9170.res b/test/files/res/t9170.res new file mode 100644 index 0000000000..c2aec2f8dd --- /dev/null +++ b/test/files/res/t9170.res @@ -0,0 +1,2 @@ +t9170/A.scala +t9170/A.scala diff --git a/test/files/res/t9170/A.scala b/test/files/res/t9170/A.scala new file mode 100644 index 0000000000..239df89679 --- /dev/null +++ b/test/files/res/t9170/A.scala @@ -0,0 +1,4 @@ +object Y { + def f[A](a: => A) = 1 + def f[A](a: => Either[Exception, A]) = 2 +} |