8000 [ci: last-only] merge 2.11.x onto 2.12.x (February 14, 2017) by SethTisue · Pull Request #5701 · scala/scala · GitHub
[go: up one dir, main page]

Skip to content

[ci: last-only] merge 2.11.x onto 2.12.x (February 14, 2017) #5701

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 51 commits into from
Feb 17, 2017
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
014ebc4
Small cleanups to pattern matcher
adriaanm Dec 21, 2016
80ce231
More robust outer test for patmat
adriaanm Dec 21, 2016
da98683
SI-9630 Fix spurious warning related to same-named case accessors [ba…
retronym Jan 27, 2016
23040fe
[Backport] Modify ArrayBuilder and WrappedArrayBuilder to be reusable
monkey-mas Dec 24, 2016
f618939
Fix documentation of immutable.Queue
Jasper-M Jan 3, 2017
8367bf6
Merge pull request #5624 from Jasper-M/patch-1
lrytz Jan 3, 2017
18269ea
Merge pull request #5612 from adriaanm/patmat_cleanup
adriaanm Jan 4, 2017
cb7192c
Restarr on 2.11.8-18269ea
adriaanm Jan 5, 2017
f31745a
SI-8774 Null link fields in mutable hash maps on removal.
Jul 21, 2016
5fd422b
Optimized HashTable.index
l0rinc Nov 22, 2016
26ad9cc
Changed modulo to bitwise AND in hash calculation
l0rinc Nov 22, 2016
276db03
Changed hashing bit rotation to use Integer.rotateRight
l0rinc Dec 6, 2016
02c30a1
Changed HashMap.getOrElseUpdate to only calculate the index once
l0rinc Nov 16, 2016
1e82a92
Simplify HashTable.index further
l0rinc Dec 6, 2016
1b6b19b
Merge pull request #5626 from adriaanm/rebase-5566
adriaanm Jan 6, 2017
4f5c30e
Merge pull request #5615 from monkey-mas/modify-ArrayBuilder-reusabil…
szeiger Jan 9, 2017
f841dab
support --show-log for partest command
adriaanm Jan 9, 2017
de361df
SI-8786 fix generic signature for @varargs forwarder methods
lrytz Jul 5, 2016
5b972dc
SI-10071 Separate compilation for varargs methods
dragos Nov 21, 2016
c603449
Don’t run the uncurry info transformer on Java symbols.
dragos Nov 24, 2016
8ad55f8
Simplify creation of varargs forwarder symbol
retronym Nov 24, 2016
8138e24
SI-9331 Fix canEqual for case classes with HK type params
retronym May 27, 2015
9165886
SI-9114 Fix crasher in pattern matcher with type aliases
retronym Jan 27, 2015
2113a7c
SI-9762 Update to JLine 2.14.3
retronym Apr 27, 2016
f070a76
SI-9762 Remove workaround after upstream fix in jline
retronym Apr 27, 2016
359b0bc
[backport] SI-6412 remove flaky test
SethTisue Oct 26, 2016
32a7461
Merge pull request #5635 from adriaanm/jline-2.14.3
adriaanm Jan 10, 2017
fac487e
Merge pull request #5633 from adriaanm/ticket/9331
adriaanm Jan 10, 2017
3696732
Merge pull request #5632 from adriaanm/ticket/9114
adriaanm Jan 10, 2017
a5d38ea
Merge pull request #5630 from adriaanm/rebase-5557
adriaanm Jan 11, 2017
648eba6
Fix the size of the stack used by RedBlackTree.iteratorFrom.
sjrd Jan 16, 2017
90a764b
Merge pull request #5645 from sjrd/avoid-array-oob-in-rbtree-iterator…
adriaanm Jan 24, 2017
dc7ff5d
SI-9013 SI-1459 Tests for inherited @varargs annotations
retronym Jan 10, 2017
a75d3fd
SI-1459 two bridges for impl of java generic vararg method
adriaanm Jan 12, 2017
6644017
Merge pull request #5631 from adriaanm/ticket/9013
adriaanm Jan 27, 2017
e803cf6
Avoid creating ListBuffer in List.mapConserve
rorygraves Sep 27, 2016
4f9faff
Test IndexedSeq, including ArrayOps, WrappedArray.
mkeskells Jan 25, 2017
d540bf0
Optimize slice and take in ArrayOps, WrappedArray
mkeskells Jan 25, 2017
eb5c513
Optimised implementation of List.filter/filterNot
rorygraves Oct 17, 2016
7e89663
Add benchmark for List.mapConserve
rorygraves Jan 28, 2017
f24c260
Handle WrappedArray the same way as ArrayOps for binary compatibility
szeiger Feb 2, 2017
214a158
Merge pull request #5664 from adriaanm/rework-coll-perf
adriaanm Feb 8, 2017
e08bccb
fix IndexedSeqTest to work in both Ant and sbt
SethTisue Feb 13, 2017
0965028
Merge pull request #5695 from SethTisue/fix-indexedseqtest-under-ant
SethTisue Feb 14, 2017
e04e281
Merge commit '8367bf68c1' into merge-2.11.x-to-2.12.x-20170214
SethTisue Feb 16, 2017
3fc5059
Merge commit '014ebc4' into merge-2.11.x-to-2.12.x-20170214
SethTisue Feb 16, 2017
2324405
Merge commit '32a7461037' into merge-2.11.x-to-2.12.x-20170214
SethTisue Feb 16, 2017
3e99598
Merge commit '36967321c7' into merge-2.11.x-to-2.12.x-20170214
SethTisue Feb 16, 2017
6be69d6
Merge commit 'a5d38ea334' into merge-2.11.x-to-2.12.x-20170214
SethTisue Feb 16, 2017
04c45e1
Merge commit '0965028809' into merge-2.11.x-to-2.12.x-20170214
SethTisue Feb 16, 2017
71a8a44
Merge branch '2.12.x' into merge-2.11.x-to-2.12.x-20170214
SethTisue Feb 17, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/reflect/scala/reflect/internal/Types.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3891,7 +3891,7 @@ trait Types
* any corresponding non-variant type arguments of bt1 and bt2 are the same
*/
def isPopulated(tp1: Type, tp2: Type): Boolean = {
def isConsistent(tp1: Type, tp2: Type): Boolean = (tp1, tp2) match {
def isConsistent(tp1: Type, tp2: Type): Boolean = (tp1.dealias, tp2.dealias) match {
case (TypeRef(pre1, sym1, args1), TypeRef(pre2, sym2, args2)) =>
assert(sym1 == sym2, (sym1, sym2))
( pre1 =:= pre2
Expand Down
31 changes: 31 additions & 0 deletions test/files/run/t9114.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import annotation.unchecked

class Test {
trait Two[A, B]
type One[A] = Two[A,A]
class View extends One[Any]

def checkAny(x: Some[One[Any]]) = x match { // okay
case Some(_: View) => true
case _ => false
}
def checkAbstract[A](x: Some[One[A]]) = x match { // okay
case Some(_: View) => true
case _ => false
}

def checkExistential(x: Some[One[_]]) = x match {
case Some(_: View) => true // compiler crash
case _ => false
}
}

object Test {
def main(args: Array[String]): Unit = {
val t1 = new Test
val t2 = new Test
assert(t1.checkAny(Some(new t1.View)))
assert(t1.checkAbstract(Some(new t1.View)))
assert(t1.checkExistential(Some(new t1.View)))
}
}
0