diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-07-06 01:42:40 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-07-06 01:42:40 -0700 |
| commit | cd0fb51ee8c49c6681c053f0ddeb531e92058c92 (patch) | |
| tree | 37f8e340a72d3dad3ffff3e9ddae1ed521663ef5 /src/reflect | |
| parent | 34d36108bf152469a934408da2b55c1df9c70a7a (diff) | |
| parent | 0529dd502a45e29aa617986ff9ab29e145d62582 (diff) | |
| download | scala-cd0fb51ee8c49c6681c053f0ddeb531e92058c92.tar.gz scala-cd0fb51ee8c49c6681c053f0ddeb531e92058c92.tar.bz2 scala-cd0fb51ee8c49c6681c053f0ddeb531e92058c92.zip | |
Merge pull request #822 from scalamacros/ticket/5959
SI-5959 type equality now accounts for mirrors
Diffstat (limited to 'src/reflect')
| -rw-r--r-- | src/reflect/scala/reflect/internal/Types.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/reflect/scala/reflect/internal/Types.scala b/src/reflect/scala/reflect/internal/Types.scala index 5a382cf518..96a6d4bba0 100644 --- a/src/reflect/scala/reflect/internal/Types.scala +++ b/src/reflect/scala/reflect/internal/Types.scala @@ -5125,7 +5125,7 @@ trait Types extends api.Types { self: SymbolTable => false private def equalSymsAndPrefixes(sym1: Symbol, pre1: Type, sym2: Symbol, pre2: Type): Boolean = - if (sym1 == sym2) sym1.hasPackageFlag || phase.erasedTypes || pre1 =:= pre2 + if (sym1 == sym2) sym1.hasPackageFlag || sym1.owner.hasPackageFlag || phase.erasedTypes || pre1 =:= pre2 else (sym1.name == sym2.name) && isUnifiable(pre1, pre2) /** Do `tp1` and `tp2` denote equivalent types? */ @@ -5612,7 +5612,7 @@ trait Types extends api.Types { self: SymbolTable => val sym2 = tr2.sym val pre1 = tr1.pre val pre2 = tr2.pre - (((if (sym1 == sym2) phase.erasedTypes || isSubType(pre1, pre2, depth) + (((if (sym1 == sym2) phase.erasedTypes || sym1.owner.hasPackageFlag || isSubType(pre1, pre2, depth) else (sym1.name == sym2.name && !sym1.isModuleClass && !sym2.isModuleClass && (isUnifiable(pre1, pre2) || isSameSpecializedSkolem(sym1, sym2, pre1, pre2) || |