Merge commit 'ac432bcde6' into pr/merge-2.10

* commit 'ac432bcde6':
  Fix broken build.
  SI-6434 Pretty print function types with by name arg as (=> A) => B
  Removed class files.
  SI-6994 Avoid spurious promiscuous catch warning
  Addressing warnings.
  SI-6439 Avoid spurious REPL warnings about companionship
  use ArrayBuffer instead of Array to build Formulae
  SI-6942 more efficient unreachability analysis
  use Constant::isIntRange even if it's NIH
  SI-6956 determine switchability by type, not tree
  SI-5568 Comment improvements for getClass on primitive intersection.
  SI-5568 Fixes verify error from getClass on refinement of value type
  SI-6923 Context now buffers warnings as well as errors

Conflicts:
	src/compiler/scala/tools/nsc/interpreter/IMain.scala
	src/compiler/scala/tools/nsc/transform/Erasure.scala
	src/compiler/scala/tools/nsc/typechecker/Contexts.scala
	src/compiler/scala/tools/nsc/typechecker/Typers.scala
	test/files/neg/t4851.check

Note:
  This merge excludes b07228aebe7a as it breaks master.

1 files changed, 1 insertions, 1 deletions

diff --git a/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala b/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala
index 2d4054e93b..ed8790e9dd 100644
--- a/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala
@@ -736,7 +736,7 @@ trait ContextErrors {
           } catch {
             // the code above tries various tricks to detect the relevant portion of the stack trace
             // if these tricks fail, just fall back to uninformative, but better than nothing, getMessage
-            case NonFatal(ex) =>
+            case NonFatal(ex) => // currently giving a spurious warning, see SI-6994
               macroLogVerbose("got an exception when processing a macro generated exception\n" +
                               "offender = " + stackTraceString(realex) + "\n" +
                               "error = " + stackTraceString(ex))