summaryrefslogtreecommitdiff
path: root/test/files/neg
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2015-01-19 13:42:35 +1000
committerJason Zaugg <jzaugg@gmail.com>2015-01-20 10:01:49 +1000
commitc30ed29f6cee9d4e0bd4a99c4be804ffcb20d281 (patch)
tree86a7c2814cc74c2f39b25b8d83bf0f6a65156427 /test/files/neg
parent783c5ccfe7c2b22f1a1bdf6530028eac0d941702 (diff)
downloadscala-c30ed29f6cee9d4e0bd4a99c4be804ffcb20d281.tar.gz
scala-c30ed29f6cee9d4e0bd4a99c4be804ffcb20d281.tar.bz2
scala-c30ed29f6cee9d4e0bd4a99c4be804ffcb20d281.zip
SI-9093 Fix value discarding / multiple param list crasher
The type error stemming from missing argument list was being swallowed when the expected type was `Unit` and there were undetermined type parameters in the expression. This commit modifies `adapt` to avoid using `instantiateExpectingUnit` when the tree is typed with `MethodType`.
Diffstat (limited to 'test/files/neg')
-rw-r--r--test/files/neg/t9093.check6
-rw-r--r--test/files/neg/t9093.scala5
2 files changed, 11 insertions, 0 deletions
diff --git a/test/files/neg/t9093.check b/test/files/neg/t9093.check
new file mode 100644
index 0000000000..085a433f0b
--- /dev/null
+++ b/test/files/neg/t9093.check
@@ -0,0 +1,6 @@
+t9093.scala:3: error: polymorphic expression cannot be instantiated to expected type;
+ found : [C](f: C)Null
+ required: Unit
+ val x: Unit = apply2(0)/*(0)*/
+ ^
+one error found
diff --git a/test/files/neg/t9093.scala b/test/files/neg/t9093.scala
new file mode 100644
index 0000000000..d9922ad70e
--- /dev/null
+++ b/test/files/neg/t9093.scala
@@ -0,0 +1,5 @@
+object Main {
+ def apply2[C](fa: Any)(f: C) = null
+ val x: Unit = apply2(0)/*(0)*/
+}
+