Move stripAnnots to isRef instead of performing explicitly everywhere

Author: felixmulder

src/dotty/tools/dotc/core/Types.scala

@@ -105,7 +105,7 @@ object Types {
      *        It makes no sense for it to be an alias type because isRef would always
      *        return false in that case.
      */
-    def isRef(sym: Symbol)(implicit ctx: Context): Boolean = stripTypeVar match {
+    def isRef(sym: Symbol)(implicit ctx: Context): Boolean = stripAnnots.stripTypeVar match {
       case this1: TypeRef =>
         this1.info match { // see comment in Namer#typeDefSig
           case TypeAlias(tp) => tp.isRef(sym)

src/dotty/tools/dotc/transform/PatternMatcher.scala

@@ -306,17 +306,11 @@ class PatternMatcher extends MiniPhaseTransform with DenotTransformer {thisTrans
     def emitSwitch(scrut: Tree, scrutSym: Symbol, cases: List[List[TreeMaker]], pt: Type, matchFailGenOverride: Option[Symbol => Tree], unchecked: Boolean): Option[Tree] = {
       // TODO Deal with guards?
 
-      def isSwitchableType(tpe: Type): Boolean = {
-        val actualTpe = tpe match {
-          case t @ AnnotatedType(inner, _) => inner
-          case x => x
-        }
-
-        (actualTpe isRef defn.IntClass) ||
-        (actualTpe isRef defn.ByteClass) ||
-        (actualTpe isRef defn.ShortClass) ||
-        (actualTpe isRef defn.CharClass)
-      }
+      def isSwitchableType(tpe: Type): Boolean =
+        (tpe isRef defn.IntClass) ||
+        (tpe isRef defn.ByteClass) ||
+        (tpe isRef defn.ShortClass) ||
+        (tpe isRef defn.CharClass)
 
       object IntEqualityTestTreeMaker {
         def unapply(treeMaker: EqualityTestTreeMaker): Option[Int] = treeMaker match {