Merge branch 'inner-class-attr'

2 files changed, 26 insertions, 0 deletions

diff --git a/test/files/run/t1167.check b/test/files/run/t1167.check
new file mode 100644
index 0000000000..885d4c9e26
--- /dev/null
+++ b/test/files/run/t1167.check
@@ -0,0 +1,3 @@
+$anon$1
+$anon$2
+$anonfun$testFunc$1
diff --git a/test/files/run/t1167.scala b/test/files/run/t1167.scala
new file mode 100644
index 0000000000..a5d938c28a
--- /dev/null
+++ b/test/files/run/t1167.scala
@@ -0,0 +1,23 @@
+/** Tests for compatible InnerClasses attribute between trait and
+ *  impl classes, as well as anonymous classes.
+ */
+
+trait Test1 {
+ def testFunc(i:Int) = ((i:Int) => i + 5)(i)
+}
+
+abstract class Foo {
+  override def toString = getClass.getSimpleName
+
+  abstract class Bar {
+    override def toString = getClass.getSimpleName
+  }
+}
+
+object Test extends Application {
+  val foo = new Foo {}
+  val bar = new foo.Bar {}
+  println(foo)
+  println(bar)
+  println(Class.forName("Test1$$anonfun$testFunc$1").getSimpleName)
+}