diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2014-02-21 15:04:01 +0100 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2014-02-21 15:04:01 +0100 |
commit | d128f624bc4cf22dc0e277706690e98ed6f084b6 (patch) | |
tree | bab1f544f705a4df0fb126dd72e1159a36856b9b /test/files | |
parent | 25f23a443bc6831d1c8d7f6f57212a29e84bbaa5 (diff) | |
parent | 917c49416133bd067c203f907e9fe9112a081ff4 (diff) | |
download | scala-d128f624bc4cf22dc0e277706690e98ed6f084b6.tar.gz scala-d128f624bc4cf22dc0e277706690e98ed6f084b6.tar.bz2 scala-d128f624bc4cf22dc0e277706690e98ed6f084b6.zip |
Merge pull request #3557 from adriaanm/t8224
SI-8224 Fix regression in f-bound aware LUBs
Diffstat (limited to 'test/files')
-rw-r--r-- | test/files/pos/t8224.scala | 12 | ||||
-rw-r--r-- | test/files/run/t2251.flags | 1 | ||||
-rw-r--r-- | test/files/run/t2251b.flags | 1 |
3 files changed, 14 insertions, 0 deletions
diff --git a/test/files/pos/t8224.scala b/test/files/pos/t8224.scala new file mode 100644 index 0000000000..2fae925df3 --- /dev/null +++ b/test/files/pos/t8224.scala @@ -0,0 +1,12 @@ +import language.higherKinds + +trait P [N1, +E1[X <: N1]] +trait PIn[N2, +E2[X <: N2]] extends P[Int,Any] + +trait EI extends PIn[Int, Nothing] +trait NI extends PIn[Int, Nothing] + +object Test { + val lub = if (true) ??? : EI else ??? : NI + val pin: PIn[Int,Nothing] = lub +} diff --git a/test/files/run/t2251.flags b/test/files/run/t2251.flags new file mode 100644 index 0000000000..19243266d1 --- /dev/null +++ b/test/files/run/t2251.flags @@ -0,0 +1 @@ +-Xstrict-inference
\ No newline at end of file diff --git a/test/files/run/t2251b.flags b/test/files/run/t2251b.flags new file mode 100644 index 0000000000..19243266d1 --- /dev/null +++ b/test/files/run/t2251b.flags @@ -0,0 +1 @@ +-Xstrict-inference
\ No newline at end of file |