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

3 files changed, 29 insertions, 1 deletions

diff --git a/test/files/pos/t5726.scala b/test/files/pos/t5726.scala
new file mode 100644
index 0000000000..b28ebd8674
--- /dev/null
+++ b/test/files/pos/t5726.scala
@@ -0,0 +1,17 @@
+import scala.language.dynamics
+
+class DynamicTest extends Dynamic {
+  def selectDynamic(name: String) = s"value of $name"
+  def updateDynamic(name: String)(value: Any) {
+    println(s"You have just updated property '$name' with value: $value")
+  }
+}
+
+object MyApp extends App {
+  def testing() {
+    val test = new DynamicTest
+    test.firstName = "John"
+  }
+
+  testing()
+}
diff --git a/test/files/pos/t6551.scala b/test/files/pos/t6551.scala
index fb68663809..8bb396a19f 100644
--- a/test/files/pos/t6551.scala
+++ b/test/files/pos/t6551.scala
@@ -1,4 +1,4 @@
-import language.dynamics
+import scala.language.dynamics
 
 object Test {
   def main(args: Array[String]) {
diff --git a/test/files/pos/t6722.scala b/test/files/pos/t6722.scala
new file mode 100644
index 0000000000..576746c915
--- /dev/null
+++ b/test/files/pos/t6722.scala
@@ -0,0 +1,11 @@
+import scala.language.dynamics
+
+class Dyn extends Dynamic {
+  def selectDynamic(s: String): Dyn = new Dyn
+  def get[T]: T = null.asInstanceOf[T]
+}
+
+object Foo {
+  val dyn = new Dyn
+  dyn.foo.bar.baz.get[String]
+}