diff options
Diffstat (limited to 'sources')
| -rw-r--r-- | sources/scalac/ast/TreeGen.java | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sources/scalac/ast/TreeGen.java b/sources/scalac/ast/TreeGen.java index 0e4b2c26f5..eacd4b1452 100644 --- a/sources/scalac/ast/TreeGen.java +++ b/sources/scalac/ast/TreeGen.java @@ -317,10 +317,7 @@ public class TreeGen implements Kinds, Modifiers, TypeTags { sym.flags |= ACCESSED; Ident tree = make.Ident(pos, sym); global.nextPhase(); - if (sym.isStable() && global.currentPhase.id <= global.PHASE.UNCURRY.id()) // !!! tmp hack - tree.setType(Type.singleType(sym.owner().thisType(), sym)); - else - tree.setType(sym.type()); + tree.setType(sym.owner().thisType().memberStabilizedType(sym)); global.prevPhase(); return tree; } @@ -334,10 +331,7 @@ public class TreeGen implements Kinds, Modifiers, TypeTags { sym.flags |= ACCESSED | SELECTOR; Select tree = make.Select(pos, sym, qual); global.nextPhase(); - if (sym.isStable() && qual.type.isStable() && global.currentPhase.id <= global.PHASE.UNCURRY.id()) // !!! tmp hack - tree.setType(Type.singleType(qual.type, sym)); - else - tree.setType(qual.type.memberType(sym)); + tree.setType(qual.type.memberStabilizedType(sym)); global.prevPhase(); return tree; } |