Remove Throw custom extractor

Author: nicolasstucki

compiler/src/dotty/tools/backend/jvm/BCodeBodyBuilder.scala

@@ -307,8 +307,8 @@ trait BCodeBodyBuilder extends BCodeSkelBuilder {
         case t @ Try(_, _, _) =>
           generatedType = genLoadTry(t)
 
-        case ThrowBI(expr) =>
-          generatedType = genThrow(expr)
+        case t: Apply if t.fun.symbol eq defn.throwMethod =>
+          generatedType = genThrow(t.args.head)
 
         case New(tpt) =>
           abort(s"Unexpected New(${tpt.tpe.showSummary()}/$tpt) reached GenBCode.\n" +

compiler/src/dotty/tools/backend/jvm/BCodeSkelBuilder.scala

@@ -584,7 +584,8 @@ trait BCodeSkelBuilder extends BCodeHelpers {
           genLoad(rhs, returnType)
 
           rhs match {
-            case (_: Return) | Block(_, (_: Return)) | ThrowBI(_) | Block(_, ThrowBI(_)) => ()
+            case (_: Return) | Block(_, (_: Return)) => ()
+            case (_: Apply) | Block(_, (_: Apply)) if rhs.symbol eq defn.throwMethod => ()
             case tpd.EmptyTree =>
               ctx.error("Concrete method has no definition: " + dd + (
                 if (ctx.settings.Ydebug.value) "(found: " + methSymbol.owner.info.decls.toList.mkString(", ") + ")"

compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala

@@ -139,21 +139,6 @@ class DottyBackendInterface(val outputDirectory: AbstractFile, val superCallsMap
     }
   }
 
-  object ThrowBI {
-    var field: tpd.Apply = _
-    def isEmpty: Boolean = field eq null
-    def isDefined = !isEmpty
-    def get: Tree = field.args.head
-    def unapply(s: tpd.Apply): ThrowBI.type = {
-      if (s.fun.symbol eq defn.throwMethod) {
-        field = s
-      } else {
-        field = null
-      }
-      this
-    }
-  }
-
   object ArrayValueBI extends DeconstructorCommon[tpd.JavaSeqLiteral] {
     def _1: Type = field.tpe match {
       case JavaArrayType(elem) => elem