diff options
| author | Adriaan Moors <adriaan@lightbend.com> | 2017-01-10 14:19:02 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-10 14:19:02 -0800 |
| commit | 36967321c7a8a99cab2f9f1c4c0c46f09d3d34a6 (patch) | |
| tree | 6a4608a54de0fafb4a9fd9eb52bb4829f9a6dadd /src | |
| parent | fac487e397c36395ee91c3b725aad6a8050cc0ad (diff) | |
| parent | 9165886936133d62a9f190a1a7587fbb889ecf9a (diff) | |
| download | scala-36967321c7a8a99cab2f9f1c4c0c46f09d3d34a6.tar.gz scala-36967321c7a8a99cab2f9f1c4c0c46f09d3d34a6.tar.bz2 scala-36967321c7a8a99cab2f9f1c4c0c46f09d3d34a6.zip | |
Merge pull request #5632 from adriaanm/ticket/9114
SI-9114 Fix crasher in pattern matcher with type aliases
Diffstat (limited to 'src')
| -rw-r--r-- | src/reflect/scala/reflect/internal/Types.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/reflect/scala/reflect/internal/Types.scala b/src/reflect/scala/reflect/internal/Types.scala index 92df4ba3af..28b16eeb1a 100644 --- a/src/reflect/scala/reflect/internal/Types.scala +++ b/src/reflect/scala/reflect/internal/Types.scala @@ -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 |