Merge branch 'merge-2.10-wip' into merge-2.10

* merge-2.10-wip:
  Fixing OSGi distribution.
  Fix for rangepos crasher.
  SI-6685 fixes error handling in typedApply
  Test cases for SI-5726, SI-5733, SI-6320, SI-6551, SI-6722.
  Asserts about Tree qualifiers.
  Fix for SI-6731, dropped trees in selectDynamic.
  neg test added
  SI-5753 macros cannot be loaded when inherited from a class or a trait
  Take advantage of the margin stripping interpolator.
  Adds a margin stripping string interpolator.
  SI-6718 fixes a volatile test
  Mark pattern matcher synthetics as SYNTHETIC.
  Set symbol flags at creation.
  Fix for SI-6687, wrong isVar logic.
  Fix for SI-6706, Symbol breakage under GC.
  findEntry implementation code more concise and DRYer.
  Fix for SI-6357, cycle with value classes.
  Refactoring of adaptMethod
  SI-6677 Insert required cast in `new qual.foo.T`

Conflicts:
	src/compiler/scala/tools/nsc/transform/Erasure.scala
	src/compiler/scala/tools/nsc/typechecker/Typers.scala
	src/reflect/scala/reflect/internal/SymbolTable.scala
	src/reflect/scala/reflect/internal/util/package.scala
	test/files/neg/gadts1.check

1 files changed, 5 insertions, 0 deletions

diff --git a/src/reflect/scala/reflect/internal/SymbolTable.scala b/src/reflect/scala/reflect/internal/SymbolTable.scala
index a0e5851a6e..1298fc17ed 100644
--- a/src/reflect/scala/reflect/internal/SymbolTable.scala
+++ b/src/reflect/scala/reflect/internal/SymbolTable.scala
@@ -344,6 +344,11 @@ abstract class SymbolTable extends macros.Universe
   @inline final def atPhase[T](ph: Phase)(op: => T): T = enteringPhase(ph)(op)
   @deprecated("Use enteringPhaseNotLaterThan", "2.10.0")
   @inline final def atPhaseNotLaterThan[T](target: Phase)(op: => T): T = enteringPhaseNotLaterThan(target)(op)
+
+  /**
+   * Adds the `sm` String interpolator to a [[scala.StringContext]].
+   */
+  implicit val StringContextStripMarginOps: StringContext => StringContextStripMarginOps = util.StringContextStripMarginOps
 }
 
 object SymbolTableStats {