Merge remote-tracking branch 'upstream/2.12.x' into opt/elimBoxes

1 files changed, 17 insertions, 0 deletions

diff --git a/test/files/pos/t3234.scala b/test/files/pos/t3234.scala
new file mode 100644
index 0000000000..c3b7366db8
--- /dev/null
+++ b/test/files/pos/t3234.scala
@@ -0,0 +1,17 @@
+trait Trait1 {
+  @inline def foo2(n: Int) = n*n
+}
+
+trait Trait2 {
+  @inline def foo3(n: Int) = 1
+}
+
+class Base extends Trait1 {
+  @inline def foo(n: Int) = n
+}
+
+object Test extends Base with Trait2 {
+  def main(args: Array[String]) = {
+    println(foo(42) + foo2(11) + foo3(2))
+  }
+}
\ No newline at end of file