diff options
Diffstat (limited to 'sources')
| -rw-r--r-- | sources/scalac/ast/TreeGen.java | 18 | ||||
| -rw-r--r-- | sources/scalac/transformer/LambdaLift.java | 10 | ||||
| -rw-r--r-- | sources/scalac/typechecker/Analyzer.java | 3 |
3 files changed, 21 insertions, 10 deletions
diff --git a/sources/scalac/ast/TreeGen.java b/sources/scalac/ast/TreeGen.java index c6d7e72332..7ffcf347ea 100644 --- a/sources/scalac/ast/TreeGen.java +++ b/sources/scalac/ast/TreeGen.java @@ -116,6 +116,18 @@ public class TreeGen implements Kinds, Modifiers, TypeTags { } } + /** Build and attribute type ident node with given symbol. + */ + public Tree mkTypeIdent(int pos, Symbol sym) { + assert sym.kind == TYPE: Debug.show(sym); + sym.flags |= ACCESSED; + return mkType(pos, sym.nextType()); + } + + public Tree mkTypeIdent(Symbol sym) { + return Ident(sym.pos, sym); + } + /** Build and attribute tree corresponding to given type. */ public Tree mkType(int pos, Type type) { @@ -496,11 +508,9 @@ public class TreeGen implements Kinds, Modifiers, TypeTags { /** Build and attribute ident node with given symbol. */ public Tree Ident(int pos, Symbol sym) { - Global.instance.nextPhase(); - Type symtype = sym.type(); - Global.instance.prevPhase(); + assert sym.isTerm(): Debug.show(sym); sym.flags |= ACCESSED; - return make.Ident(pos, sym).setType(deref(symtype)); + return make.Ident(pos, sym).setType(deref(sym.nextType())); } public Tree Ident(Symbol sym) { diff --git a/sources/scalac/transformer/LambdaLift.java b/sources/scalac/transformer/LambdaLift.java index 5640938030..bf934877ae 100644 --- a/sources/scalac/transformer/LambdaLift.java +++ b/sources/scalac/transformer/LambdaLift.java @@ -426,17 +426,17 @@ public class LambdaLift extends OwnerTransformer switch (fn1) { case TypeApply(Tree fn2, Tree[] targs): fn1 = copy.TypeApply( - fn1, fn2, addFreeArgs(tree.pos, get(free.ftvs, fsym), targs)); + fn1, fn2, addFreeArgs(tree.pos, get(free.ftvs, fsym), targs, true)); break; default: Tree[] targs = addFreeArgs( - tree.pos, get(free.ftvs, fsym), Tree.EMPTY_ARRAY); + tree.pos, get(free.ftvs, fsym), Tree.EMPTY_ARRAY, true); if (targs.length > 0) fn1 = gen.TypeApply(fn1, targs); } Tree[] args1 = transform(args); return copy.Apply( - tree, fn1, addFreeArgs(tree.pos, get(free.fvs, fsym), args1)); + tree, fn1, addFreeArgs(tree.pos, get(free.fvs, fsym), args1, false)); case Ident(Name name): Symbol sym = tree.symbol(); @@ -633,7 +633,7 @@ public class LambdaLift extends OwnerTransformer /** For all variables or type variables in `fvs', * append proxies to argument array `args'. */ - Tree[] addFreeArgs(int pos, SymSet fvs, Tree[] args) { + Tree[] addFreeArgs(int pos, SymSet fvs, Tree[] args, boolean types) { if (fvs != SymSet.EMPTY) { Symbol[] fparams = fvs.toArray(); Tree[] args1 = new Tree[args.length + fparams.length]; @@ -641,7 +641,7 @@ public class LambdaLift extends OwnerTransformer for (int i = 0; i < fparams.length; i++) { Symbol farg = descr.proxy(fparams[i], currentOwner); args1[args.length + i] = - gen.Ident(pos, farg).setType(farg.nextType()); + types ? gen.mkTypeIdent(pos, farg) : gen.Ident(pos, farg); } return args1; } else { diff --git a/sources/scalac/typechecker/Analyzer.java b/sources/scalac/typechecker/Analyzer.java index 2c887c9393..55da4c5f88 100644 --- a/sources/scalac/typechecker/Analyzer.java +++ b/sources/scalac/typechecker/Analyzer.java @@ -2364,7 +2364,8 @@ public class Analyzer extends Transformer implements Modifiers, Kinds { case Ident(Name name): if (name == Names.CONSTRUCTOR) { assert (mode & CONSTRmode) != 0 : tree; - return gen.Ident(tree.pos, context.constructorClass); + return copy.Ident(tree, context.constructorClass) + .setType(context.constructorClass.nextType()); /* */ } else if (((mode & (PATTERNmode | FUNmode)) == PATTERNmode) && |