diff options
| author | Guillaume Martres <smarter@ubuntu.com> | 2017-03-07 14:50:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-07 14:50:03 +0100 |
| commit | 3c4d29eabaa71c30ccc2c7b62517d771d6f9d8f5 (patch) | |
| tree | 9d5bcfddb150325cb825a2ce1198fbb3e88e7a05 | |
| parent | bade85e43b3213af752cb1eed52190cb8569feb6 (diff) | |
| parent | b2f30edc13a3af7fdfec6812b61fce8ca83cde91 (diff) | |
| download | dotty-3c4d29eabaa71c30ccc2c7b62517d771d6f9d8f5.tar.gz dotty-3c4d29eabaa71c30ccc2c7b62517d771d6f9d8f5.tar.bz2 dotty-3c4d29eabaa71c30ccc2c7b62517d771d6f9d8f5.zip | |
Merge pull request #2061 from dotty-staging/fix/overcompilation-api
Fix incremental overcompilation due to instabilities
| -rw-r--r-- | compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala b/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala index 7f44af486..599522b74 100644 --- a/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala +++ b/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala @@ -350,7 +350,7 @@ private class ExtractAPICollector(implicit val ctx: Context) extends ThunkHolder case tp: NamedType => val sym = tp.symbol // Normalize package prefix to avoid instability of representation - val prefix = if (sym.isClass && sym.owner.is(Package)) + val prefix = if (sym.owner.is(Package)) sym.owner.thisType else tp.prefix @@ -358,7 +358,7 @@ private class ExtractAPICollector(implicit val ctx: Context) extends ThunkHolder case TypeApplications.AppliedType(tycon, args) => def processArg(arg: Type): api.Type = arg match { case arg @ TypeBounds(lo, hi) => // Handle wildcard parameters - if (lo.eq(defn.NothingType) && hi.eq(defn.AnyType)) + if (lo.isDirectRef(defn.NothingClass) && hi.isDirectRef(defn.AnyClass)) Constants.emptyType else { val name = "_" |