diff options
Diffstat (limited to 'test/junit/scala/tools/nsc/backend/jvm/opt/InlinerSeparateCompilationTest.scala')
-rw-r--r-- | test/junit/scala/tools/nsc/backend/jvm/opt/InlinerSeparateCompilationTest.scala | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/test/junit/scala/tools/nsc/backend/jvm/opt/InlinerSeparateCompilationTest.scala b/test/junit/scala/tools/nsc/backend/jvm/opt/InlinerSeparateCompilationTest.scala index 52e19b48fd..6562f81e4c 100644 --- a/test/junit/scala/tools/nsc/backend/jvm/opt/InlinerSeparateCompilationTest.scala +++ b/test/junit/scala/tools/nsc/backend/jvm/opt/InlinerSeparateCompilationTest.scala @@ -42,15 +42,10 @@ class InlinerSeparateCompilationTest { |} """.stripMargin - val warns = Set( - "T::f()I is annotated @inline but cannot be inlined: the method is not final and may be overridden", - // TODO SD-85 - """O$::f()I is annotated @inline but could not be inlined: - |The callee O$::f()I contains the instruction INVOKESPECIAL T.f ()I - |that would cause an IllegalAccessError when inlined into class C""".stripMargin) - val List(c, o, oMod, t) = compileClassesSeparately(List(codeA, codeB), args + " -Yopt-warnings", i => warns.exists(i.msg contains _)) + val warn = "T::f()I is annotated @inline but cannot be inlined: the method is not final and may be overridden" + val List(c, o, oMod, t) = compileClassesSeparately(List(codeA, codeB), args + " -Yopt-warnings", _.msg contains warn) assertInvoke(getSingleMethod(c, "t1"), "T", "f") -// assertNoInvoke(getSingleMethod(c, "t2")) // SD-85 + assertNoInvoke(getSingleMethod(c, "t2")) assertNoInvoke(getSingleMethod(c, "t3")) } |