10 files changed, 55 insertions, 8 deletions
diff --git a/test/files/run/reify_fors.flags b/test/files/run/reify_fors.flags
index ba80cad69b..e69de29bb2 100644
--- a/test/files/run/reify_fors.flags
+++ b/test/files/run/reify_fors.flags
@@ -1 +0,0 @@
--Xoldpatmat
diff --git a/test/files/run/reify_maps.flags b/test/files/run/reify_maps.flags
index ba80cad69b..e69de29bb2 100644
--- a/test/files/run/reify_maps.flags
+++ b/test/files/run/reify_maps.flags
@@ -1 +0,0 @@
--Xoldpatmat
diff --git a/test/files/run/repl-suppressed-warnings.scala b/test/files/run/repl-suppressed-warnings.scala
index 9afbbaf1a5..1a51afe34f 100644
--- a/test/files/run/repl-suppressed-warnings.scala
+++ b/test/files/run/repl-suppressed-warnings.scala
@@ -1,7 +1,7 @@
 import scala.tools.partest.ReplTest
 
 object Test extends ReplTest {
-  override def extraSettings = "-Xoldpatmat"
+  override def extraSettings = ""
   def code = """
 
 // "Is this thing on?" Not working on first couple
diff --git a/test/files/run/t4536.check b/test/files/run/t4536.check
new file mode 100644
index 0000000000..0c5a72ada7
--- /dev/null
+++ b/test/files/run/t4536.check
@@ -0,0 +1,8 @@
+cls: bar
+obj: foo
+obj: bar
+cls: bar
+obj: bar
+trait: pili
+trait: mili
+trait: foo
+\ No newline at end of file
diff --git a/test/files/run/t4536.scala b/test/files/run/t4536.scala
new file mode 100644
index 0000000000..acd91deb7f
--- /dev/null
+++ b/test/files/run/t4536.scala
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+object dynamicObject extends Dynamic {
+  def applyDynamic(m: String)() = println("obj: " + m);
+  this.foo()
+}
+
+
+class dynamicClass extends Dynamic {
+  def applyDynamic(m: String)() = println("cls: " + m);
+  this.bar()
+  dynamicObject.bar()
+}
+
+
+abstract class dynamicAbstractClass extends Dynamic {
+  def applyDynamic(m: String)(args: Any*): Unit
+  this.pili(1, new dynamicClass, "hello");
+}
+
+
+trait dynamicTrait extends Dynamic {
+  def applyDynamic(m: String)(args: Any*) = println("trait: " + m);
+  def two = 2
+  this.mili(1,2,3)
+  two
+}
+
+
+object dynamicMixin extends dynamicAbstractClass with dynamicTrait {
+  this.foo(None)
+}
+
+
+object Test {
+  
+  def main(args: Array[String]) {
+    val cls = new dynamicClass
+    dynamicMixin
+  }
+  
+}
diff --git a/test/files/run/t5272_1.flags b/test/files/run/t5272_1.flags
index cb8324a345..e69de29bb2 100644
--- a/test/files/run/t5272_1.flags
+++ b/test/files/run/t5272_1.flags
@@ -1 +0,0 @@
--Xoldpatmat
-\ No newline at end of file
diff --git a/test/files/run/t5272_2.flags b/test/files/run/t5272_2.flags
index cb8324a345..e69de29bb2 100644
--- a/test/files/run/t5272_2.flags
+++ b/test/files/run/t5272_2.flags
@@ -1 +0,0 @@
--Xoldpatmat
-\ No newline at end of file
diff --git a/test/files/run/t5273_1.flags b/test/files/run/t5273_1.flags
index ba80cad69b..e69de29bb2 100644
--- a/test/files/run/t5273_1.flags
+++ b/test/files/run/t5273_1.flags
@@ -1 +0,0 @@
--Xoldpatmat
diff --git a/test/files/run/t5273_2a.flags b/test/files/run/t5273_2a.flags
index ba80cad69b..e69de29bb2 100644
--- a/test/files/run/t5273_2a.flags
+++ b/test/files/run/t5273_2a.flags
@@ -1 +0,0 @@
--Xoldpatmat
diff --git a/test/files/run/t5273_2b.flags b/test/files/run/t5273_2b.flags
index ba80cad69b..e69de29bb2 100644
--- a/test/files/run/t5273_2b.flags
+++ b/test/files/run/t5273_2b.flags
@@ -1 +0,0 @@
--Xoldpatmat