SI-7047 fixes silent for c.inferImplicitXXX

This is a port of https://github.com/scala/scala/commit/b4da864247 from 2.10.x.

5 files changed, 32 insertions, 9 deletions

diff --git a/src/compiler/scala/reflect/macros/runtime/Typers.scala b/src/compiler/scala/reflect/macros/runtime/Typers.scala
index 30370119fe..07d18eabe6 100644
--- a/src/compiler/scala/reflect/macros/runtime/Typers.scala
+++ b/src/compiler/scala/reflect/macros/runtime/Typers.scala
@@ -54,10 +54,13 @@ trait Typers {
     wrapper(universe.analyzer.inferImplicit(tree, pt, reportAmbiguous = true, isView = isView, context = context, saveAmbiguousDivergent = !silent, pos = pos)) match {
       case failure if failure.tree.isEmpty =>
         macroLogVerbose("implicit search has failed. to find out the reason, turn on -Xlog-implicits")
-        context.firstError match {
-          case Some(err) => throw new TypecheckException(err.errPos, err.errMsg)
-          case None      => universe.EmptyTree
+        if (!silent) {
+          val err = context.firstError
+          val errPos = err.map(_.errPos).getOrElse(pos)
+          val errMsg = err.map(_.errMsg).getOrElse("implicit search has failed. to find out the reason, turn on -Xlog-implicits")
+          throw new TypecheckException(errPos, errMsg)
         }
+        universe.EmptyTree
       case success =>
         success.tree
     }
diff --git a/src/compiler/scala/tools/reflect/ToolBoxFactory.scala b/src/compiler/scala/tools/reflect/ToolBoxFactory.scala
index 7f7bcd70d2..8512c32361 100644
--- a/src/compiler/scala/tools/reflect/ToolBoxFactory.scala
+++ b/src/compiler/scala/tools/reflect/ToolBoxFactory.scala
@@ -183,12 +183,10 @@ abstract class ToolBoxFactory[U <: JavaUniverse](val u: U) { factorySelf =>
             trace("inferring implicit %s (macros = %s): ".format(if (isView) "view" else "value", !withMacrosDisabled))(showAttributed(pt, true, true, settings.Yshowsymkinds.value))
             val context = currentTyper.context
             val result = analyzer.inferImplicit(tree, pt, reportAmbiguous = true, isView = isView, context = context, saveAmbiguousDivergent = !silent, pos = pos)
-            if (result.isFailure) {
-              // @H: what's the point of tracing an empty tree?
-              trace("implicit search has failed. to find out the reason, turn on -Xlog-implicits: ")(result.tree)
-              context.firstError foreach { err =>
-                throw ToolBoxError("reflective implicit search has failed: %s".format(err.errMsg))
-              }
+            if (result.isFailure && !silent) {
+              val err = context.firstError
+              val errMsg = err.map(_.errMsg).getOrElse("reflective implicit search has failed. to find out the reason, turn on -Xlog-implicits")
+              throw ToolBoxError(errMsg)
             }
             result.tree
           })
diff --git a/test/files/run/t7047.check b/test/files/run/t7047.check
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/test/files/run/t7047.check
diff --git a/test/files/run/t7047/Impls_Macros_1.scala b/test/files/run/t7047/Impls_Macros_1.scala
new file mode 100644
index 0000000000..2992e3efe4
--- /dev/null
+++ b/test/files/run/t7047/Impls_Macros_1.scala
@@ -0,0 +1,19 @@
+import scala.reflect.macros.Context
+import language.experimental.macros
+
+class Foo
+
+object Macros {
+  def impl(c: Context) = {
+    import c.universe._
+    try {
+      c.inferImplicitValue(typeOf[Foo], silent = false)
+      c.abort(c.enclosingPosition, "silent=false is not working")
+    } catch {
+      case _: Exception =>
+    }
+    c.literalNull
+  }
+
+  def foo = macro impl
+}
\ No newline at end of file
diff --git a/test/files/run/t7047/Test_2.scala b/test/files/run/t7047/Test_2.scala
new file mode 100644
index 0000000000..acfddae942
--- /dev/null
+++ b/test/files/run/t7047/Test_2.scala
@@ -0,0 +1,3 @@
+object Test extends App {
+  Macros.foo
+}
\ No newline at end of file