- Removed methods typeOf0

2 files changed, 3 insertions, 20 deletions

diff --git a/sources/scalac/transformer/matching/AlgebraicMatcher.java b/sources/scalac/transformer/matching/AlgebraicMatcher.java
index 173d239424..ea07730a1a 100644
--- a/sources/scalac/transformer/matching/AlgebraicMatcher.java
+++ b/sources/scalac/transformer/matching/AlgebraicMatcher.java
@@ -71,12 +71,6 @@ public class AlgebraicMatcher extends PatternMatcher {
         return sym.type();
     }
 
-    /** return the analyzed type
-     */
-    public Type typeOf0(Symbol sym) {
-        return sym.typeAt(unit.global.PHASE.ANALYZER.id());
-    }
-
     /** factories
      */
 
@@ -161,13 +155,8 @@ public class AlgebraicMatcher extends PatternMatcher {
 	return tpe;
     }
 
-    protected Type getHeaderType(Type tpe) {
-        switch (tpe) {
-            case PolyType(_, Type res):
-                return res;
-            default:
-                return tpe;
-        }
+    protected Type getHeaderType(Symbol sym) {
+        return sym.type().resultType();
     }
 
       /** constructs a pattern node depending on the case of argument `tree'
@@ -304,7 +293,7 @@ public class AlgebraicMatcher extends PatternMatcher {
               Symbol typeSym = ((ClassSymbol) casted.type().symbol())
                     .caseFieldAccessor(index);
 
-              Type castType = getHeaderType( typeOf0( typeSym )).asSeenFrom(typeOf(casted), typeSym.owner());
+              Type castType = getHeaderType(typeSym).asSeenFrom(typeOf(casted), typeSym.owner());
               target.and = curHeader =
                     mk.Header(pat.pos,
                               castType,
diff --git a/sources/scalac/transformer/matching/CodeFactory.java b/sources/scalac/transformer/matching/CodeFactory.java
index b702932b86..3fc83f9a17 100644
--- a/sources/scalac/transformer/matching/CodeFactory.java
+++ b/sources/scalac/transformer/matching/CodeFactory.java
@@ -417,12 +417,6 @@ class CodeFactory extends PatternTool {
         //return sym.typeAt(unit.global.ANALYZER_PHASE.id);
     }
 
-    /** return the analyzed type
-     */
-    public Type typeOf0(Symbol sym) {
-        return sym.typeAt(unit.global.PHASE.ANALYZER.id());
-    }
-
 
     protected Tree Block(int pos, Tree[] ts, Type tpe) {
         if (ts.length == 1)