From 70c6897197370531b4626ec7a0bee4ab71be3b22 Mon Sep 17 00:00:00 2001 From: paltherr Date: Sat, 10 Apr 2004 01:48:55 +0000 Subject: - Removed calls to Symbol.module() --- sources/scalac/transformer/TailCallPhase.java | 13 +------------ sources/scalac/transformer/TypesAsValuesPhase.java | 5 +---- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/sources/scalac/transformer/TailCallPhase.java b/sources/scalac/transformer/TailCallPhase.java index 29cce5dc5e..57857bc3c4 100644 --- a/sources/scalac/transformer/TailCallPhase.java +++ b/sources/scalac/transformer/TailCallPhase.java @@ -154,14 +154,11 @@ public class TailCallPhase extends Phase { /** Transforms the given function call. */ private Tree transform(Tree tree, Tree fun, Tree[] vargs) { - Symbol symbol = fun.symbol(); - if (symbol != method) return tree; + if (fun.symbol() != method) return tree; switch (fun) { case Select(Tree qual, _): if (!isReferenceToThis(qual, method.owner())) return tree; return gen.Apply(tree.pos, gen.Ident(qual.pos, label), vargs); - case Ident(_): - return tree; // !!! or is this a tail call? default: throw Debug.abort("illegal case", fun); } @@ -176,14 +173,6 @@ public class TailCallPhase extends Phase { case This(_): assert tree.symbol() == clasz: tree +" -- "+ Debug.show(clasz); return true; - case Select(Tree qual, _): - if (!clasz.isModuleClass()) return false; - if (tree.symbol() != clasz.module()) return false; - return isReferenceToThis(qual, clasz.owner()); - case Ident(_): - if (!clasz.isModuleClass()) return false; - if (tree.symbol() != clasz.module()) return false; - return true; default: return false; } diff --git a/sources/scalac/transformer/TypesAsValuesPhase.java b/sources/scalac/transformer/TypesAsValuesPhase.java index 103234b984..5f672841f2 100644 --- a/sources/scalac/transformer/TypesAsValuesPhase.java +++ b/sources/scalac/transformer/TypesAsValuesPhase.java @@ -64,7 +64,6 @@ public class TypesAsValuesPhase extends Phase { private final Definitions defs = global.definitions; private final Primitives prims = global.primitives; - private final Symbol typeClass = defs.TYPE_CLASS; private final Type typeType = defs.TYPE_TYPE(); private final Type.MethodType typeAccessorType = new Type.MethodType(new Symbol[]{}, typeType); @@ -391,9 +390,7 @@ public class TypesAsValuesPhase extends Phase { Symbol symOwner = sym.owner(); if (basicTypes.containsKey(sym)) { - return gen.mkRef(pos, - gen.mkGlobalRef(pos, typeClass.module()), - (Symbol)basicTypes.get(sym)); + return gen.mkGlobalRef(pos, (Symbol)basicTypes.get(sym)); } else if (symOwner.isClass() || symOwner.isMethod()) { // Reference to a "local" type. Symbol accessor = getAccessorSymbol(sym); -- cgit v1.2.3