diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2016-04-04 11:51:38 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@gmail.com> | 2016-04-04 20:03:56 +0200 |
| commit | b36658d257115329cfe25b794685bc85ea1cfc22 (patch) | |
| tree | b7e7a72e9afcedb9922fe250bfc9a497515b0113 /test/junit/scala/tools | |
| parent | 53517b85ec82352903fcc6a346066765325247b8 (diff) | |
| download | scala-b36658d257115329cfe25b794685bc85ea1cfc22.tar.gz scala-b36658d257115329cfe25b794685bc85ea1cfc22.tar.bz2 scala-b36658d257115329cfe25b794685bc85ea1cfc22.zip | |
Remove dead code in the optimizer related to trait impl classes
Diffstat (limited to 'test/junit/scala/tools')
| -rw-r--r-- | test/junit/scala/tools/nsc/backend/jvm/opt/ScalaInlineInfoTest.scala | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/test/junit/scala/tools/nsc/backend/jvm/opt/ScalaInlineInfoTest.scala b/test/junit/scala/tools/nsc/backend/jvm/opt/ScalaInlineInfoTest.scala index 10ab006017..f449b8bb45 100644 --- a/test/junit/scala/tools/nsc/backend/jvm/opt/ScalaInlineInfoTest.scala +++ b/test/junit/scala/tools/nsc/backend/jvm/opt/ScalaInlineInfoTest.scala @@ -66,32 +66,31 @@ class ScalaInlineInfoTest extends ClearAfterClass { val cs @ List(t, tl, to) = compileClasses(compiler)(code) val info = inlineInfo(t) val expect = InlineInfo ( - None, // self type false, // final class None, // not a sam Map( // TODO SD-86: the module accessor used to be `effectivelyFinal` before nuke-impl-classes - ("O()LT$O$;", MethodInlineInfo(false,false,false,false)), - ("T$$super$toString()Ljava/lang/String;", MethodInlineInfo(false,false,false,false)), - ("T$_setter_$x1_$eq(I)V", MethodInlineInfo(false,false,false,false)), - ("f1()I", MethodInlineInfo(false,false,false,false)), - ("f3()I", MethodInlineInfo(false,false,false,false)), - ("f4()Ljava/lang/String;", MethodInlineInfo(false,false,true, false)), - ("f5()I", MethodInlineInfo(false,false,false,false)), - ("f6()I", MethodInlineInfo(false,false,false,true )), - ("x1()I", MethodInlineInfo(false,false,false,false)), - ("x3()I", MethodInlineInfo(false,false,false,false)), - ("x3_$eq(I)V", MethodInlineInfo(false,false,false,false)), - ("x4()I", MethodInlineInfo(false,false,false,false)), - ("x5()I", MethodInlineInfo(true, false,false,false)), - ("y2()I", MethodInlineInfo(false,false,false,false)), - ("y2_$eq(I)V", MethodInlineInfo(false,false,false,false)), - ("f2()I", MethodInlineInfo(true, false,false,false)), - ("L$lzycompute$1(Lscala/runtime/VolatileObjectRef;)LT$L$2$;",MethodInlineInfo(true, false,false,false)), + ("O()LT$O$;", MethodInlineInfo(false,false,false)), + ("T$$super$toString()Ljava/lang/String;", MethodInlineInfo(false,false,false)), + ("T$_setter_$x1_$eq(I)V", MethodInlineInfo(false,false,false)), + ("f1()I", MethodInlineInfo(false,false,false)), + ("f3()I", MethodInlineInfo(false,false,false)), + ("f4()Ljava/lang/String;", MethodInlineInfo(false,true, false)), + ("f5()I", MethodInlineInfo(false,false,false)), + ("f6()I", MethodInlineInfo(false,false,true )), + ("x1()I", MethodInlineInfo(false,false,false)), + ("x3()I", MethodInlineInfo(false,false,false)), + ("x3_$eq(I)V", MethodInlineInfo(false,false,false)), + ("x4()I", MethodInlineInfo(false,false,false)), + ("x5()I", MethodInlineInfo(true, false,false)), + ("y2()I", MethodInlineInfo(false,false,false)), + ("y2_$eq(I)V", MethodInlineInfo(false,false,false)), + ("f2()I", MethodInlineInfo(true, false,false)), + ("L$lzycompute$1(Lscala/runtime/VolatileObjectRef;)LT$L$2$;",MethodInlineInfo(true, false,false)), // TODO SD-86: should probably be effectivelyFinal - ("L$1(Lscala/runtime/VolatileObjectRef;)LT$L$2$;", MethodInlineInfo(false,false,false,false)), - ("nest$1()I", MethodInlineInfo(true, false,false,false)), - ("$init$()V", MethodInlineInfo(false,false,false,false))), + ("L$1(Lscala/runtime/VolatileObjectRef;)LT$L$2$;", MethodInlineInfo(false,false,false)), + ("nest$1()I", MethodInlineInfo(true, false,false)), + ("$init$()V", MethodInlineInfo(false,false,false))), None // warning ) assert(info == expect, info) |