more clean up in the macro engine

Now when SI-7507 is fixed in starr, we can actually remove a workaround
and make a 10 line reduction in the size of Resolvers.scala.

1 files changed, 3 insertions, 14 deletions

diff --git a/src/compiler/scala/reflect/macros/compiler/Resolvers.scala b/src/compiler/scala/reflect/macros/compiler/Resolvers.scala
index 05e229c51c..4484c234aa 100644
--- a/src/compiler/scala/reflect/macros/compiler/Resolvers.scala
+++ b/src/compiler/scala/reflect/macros/compiler/Resolvers.scala
@@ -25,22 +25,11 @@ trait Resolvers {
       typer.silent(_.typed(markMacroImplRef(core)), reportAmbiguousErrors = false).nonEmpty
     }
 
-    lazy val macroImplRef: Tree =
+    lazy val (macroImplRef, isBlackbox, macroImplOwner, macroImpl, targs) =
       typer.silent(_.typed(markMacroImplRef(untypedMacroImplRef)), reportAmbiguousErrors = false) match {
-        case SilentResultValue(success) => success
+        case SilentResultValue(macroImplRef @ MacroImplReference(_, isBlackbox, owner, meth, targs)) => (macroImplRef, isBlackbox, owner, meth, targs)
+        case SilentResultValue(macroImplRef) => MacroImplReferenceWrongShapeError()
         case SilentTypeError(err) => abort(err.errPos, err.errMsg)
       }
-
-    // FIXME: cannot write this concisely because of SI-7507
-    // lazy val (_, macroImplOwner, macroImpl, macroImplTargs) =
-    private lazy val dissectedMacroImplRef =
-      macroImplRef match {
-        case MacroImplReference(_, isBlackbox, owner, meth, targs) => (isBlackbox, owner, meth, targs)
-        case _ => MacroImplReferenceWrongShapeError()
-      }
-    lazy val isBlackbox = dissectedMacroImplRef._1
-    lazy val macroImplOwner = dissectedMacroImplRef._2
-    lazy val macroImpl = dissectedMacroImplRef._3
-    lazy val targs = dissectedMacroImplRef._4
   }
 }