aboutsummaryrefslogtreecommitdiff
path: root/src/dotty/tools/dotc/core/Denotations.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2015-07-23 17:42:55 +0200
committerMartin Odersky <odersky@gmail.com>2015-10-01 19:33:25 +0200
commitfe714ed2b6aaca41f1e6681b217022b301f3049d (patch)
tree07984582b64af2709b40e10a967da532ae6d0255 /src/dotty/tools/dotc/core/Denotations.scala
parent78239daf86cf6d45fec46f259e55e1fdbd963046 (diff)
downloaddotty-fe714ed2b6aaca41f1e6681b217022b301f3049d.tar.gz
dotty-fe714ed2b6aaca41f1e6681b217022b301f3049d.tar.bz2
dotty-fe714ed2b6aaca41f1e6681b217022b301f3049d.zip
Change some occurrences of <:< to frozen_<:<
Some subtype tests should not instantiate type variables, in particular those having to do with & and |.
Diffstat (limited to 'src/dotty/tools/dotc/core/Denotations.scala')
-rw-r--r--src/dotty/tools/dotc/core/Denotations.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dotty/tools/dotc/core/Denotations.scala b/src/dotty/tools/dotc/core/Denotations.scala
index fff447803..b223a8086 100644
--- a/src/dotty/tools/dotc/core/Denotations.scala
+++ b/src/dotty/tools/dotc/core/Denotations.scala
@@ -339,8 +339,8 @@ object Denotations {
val info1 = denot1.info
val info2 = denot2.info
val sameSym = sym1 eq sym2
- if (sameSym && info1 <:< info2) denot2
- else if (sameSym && info2 <:< info1) denot1
+ if (sameSym && (info1 frozen_<:< info2)) denot2
+ else if (sameSym && (info2 frozen_<:< info1)) denot1
else {
val jointSym =
if (sameSym) sym1