1 files changed, 19 insertions, 16 deletions
diff --git a/src/compiler/scala/reflect/macros/contexts/Typers.scala b/src/compiler/scala/reflect/macros/contexts/Typers.scala
index 28c1e3ddb3..baf066c7d9 100644
--- a/src/compiler/scala/reflect/macros/contexts/Typers.scala
+++ b/src/compiler/scala/reflect/macros/contexts/Typers.scala
@@ -18,22 +18,25 @@ trait Typers {
    * @see [[scala.tools.reflect.ToolBox.typeCheck]]
    */
   def typecheck(tree: Tree, mode: TypecheckMode = TERMmode, pt: Type = universe.WildcardType, silent: Boolean = false, withImplicitViewsDisabled: Boolean = false, withMacrosDisabled: Boolean = false): Tree = {
-    macroLogVerbose("typechecking %s with expected type %s, implicit views = %s, macros = %s".format(tree, pt, !withImplicitViewsDisabled, !withMacrosDisabled))
-    val context = callsiteTyper.context
-    val withImplicitFlag = if (!withImplicitViewsDisabled) (context.withImplicitsEnabled[Tree] _) else (context.withImplicitsDisabled[Tree] _)
-    val withMacroFlag = if (!withMacrosDisabled) (context.withMacrosEnabled[Tree] _) else (context.withMacrosDisabled[Tree] _)
-    def withContext(tree: => Tree) = withImplicitFlag(withMacroFlag(tree))
-    def withWrapping(tree: Tree)(op: Tree => Tree) = if (mode == TERMmode) universe.wrappingIntoTerm(tree)(op) else op(tree)
-    def typecheckInternal(tree: Tree) = callsiteTyper.silent(_.typed(universe.duplicateAndKeepPositions(tree), mode, pt), reportAmbiguousErrors = false)
-    withWrapping(tree)(wrappedTree => withContext(typecheckInternal(wrappedTree) match {
-      case universe.analyzer.SilentResultValue(result) =>
-        macroLogVerbose(result)
-        result
-      case error @ universe.analyzer.SilentTypeError(_) =>
-        macroLogVerbose(error.err.errMsg)
-        if (!silent) throw new TypecheckException(error.err.errPos, error.err.errMsg)
-        universe.EmptyTree
-    }))
+    macroLogVerbose(s"typechecking $tree with expected type $pt, implicit views = ${!withImplicitViewsDisabled}, macros = ${!withMacrosDisabled}")
+    import callsiteTyper.context
+    def doTypecheck(wrapped: Tree): Tree =
+      context.withImplicits(enabled = !withImplicitViewsDisabled) {
+        context.withMacros(enabled = !withMacrosDisabled) {
+          callsiteTyper.silent(_.typed(universe.duplicateAndKeepPositions(wrapped), mode, pt), reportAmbiguousErrors = false) match {
+            case universe.analyzer.SilentResultValue(result) =>
+              macroLogVerbose(result)
+              result
+            case error@universe.analyzer.SilentTypeError(_) =>
+              macroLogVerbose(error.err.errMsg)
+              if (!silent) throw new TypecheckException(error.err.errPos, error.err.errMsg)
+              universe.EmptyTree
+          }
+        }
+      }
+
+    if (mode == TERMmode) universe.wrappingIntoTerm(tree)(doTypecheck)
+    else doTypecheck(tree)
   }
 
   def inferImplicitValue(pt: Type, silent: Boolean = true, withMacrosDisabled: Boolean = false, pos: Position = enclosingPosition): Tree = {