diff options
| author | Paul Phillips <paulp@improving.org> | 2012-12-31 01:49:32 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-12-31 03:04:46 -0800 |
| commit | 340529410696da2e5110d49a5a8d19572bf272ba (patch) | |
| tree | f83d97c1154486c5205e15fc85282ed1fa3593a5 | |
| parent | ca98602e8243062c8e1e86afe954c48edc09cbad (diff) | |
| download | scala-340529410696da2e5110d49a5a8d19572bf272ba.tar.gz scala-340529410696da2e5110d49a5a8d19572bf272ba.tar.bz2 scala-340529410696da2e5110d49a5a8d19572bf272ba.zip | |
SI-6897, lubs and varargs star.
Don't allow lubs to calculate refinement types which contain
a varargs star outside of legal varargs star position.
| -rw-r--r-- | src/reflect/scala/reflect/internal/Types.scala | 5 | ||||
| -rw-r--r-- | test/files/pos/t6897.scala | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/reflect/scala/reflect/internal/Types.scala b/src/reflect/scala/reflect/internal/Types.scala index 119a57d268..bfd18f6a43 100644 --- a/src/reflect/scala/reflect/internal/Types.scala +++ b/src/reflect/scala/reflect/internal/Types.scala @@ -6801,7 +6801,10 @@ trait Types extends api.Types { self: SymbolTable => else lubBase } } - existentialAbstraction(tparams, lubType) + // dropRepeatedParamType is a localized fix for SI-6897. We should probably + // integrate that transformation at a lower level in master, but lubs are + // the likely and maybe only spot they escape, so fixing here for 2.10.1. + existentialAbstraction(tparams, dropRepeatedParamType(lubType)) } if (printLubs) { println(indent + "lub of " + ts + " at depth "+depth)//debug diff --git a/test/files/pos/t6897.scala b/test/files/pos/t6897.scala new file mode 100644 index 0000000000..a7a03a1d3a --- /dev/null +++ b/test/files/pos/t6897.scala @@ -0,0 +1,6 @@ +class A { + val html = (null: Any) match { + case 1 => <xml:group></xml:group> + case 2 => <p></p> + } +} |