diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2015-07-27 13:33:16 +1000 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2015-07-27 13:33:16 +1000 |
commit | f682441f6f402cc22a747ea93547631af9cb669d (patch) | |
tree | a54803d9231347bfa92e72e94d19fac125b22f22 /test/files | |
parent | f2d7838d904572b3dd15a9ef223ecfd1a6e14697 (diff) | |
parent | 2678d349b2b2738d9db38d890199f32aa39d8c3e (diff) | |
download | scala-f682441f6f402cc22a747ea93547631af9cb669d.tar.gz scala-f682441f6f402cc22a747ea93547631af9cb669d.tar.bz2 scala-f682441f6f402cc22a747ea93547631af9cb669d.zip |
Merge pull request #4653 from lrytz/t9403
SI-9403 fix ICodeReader for negative BIPUSH / SIPUSH values
Diffstat (limited to 'test/files')
-rw-r--r-- | test/files/run/t9403.flags | 1 | ||||
-rw-r--r-- | test/files/run/t9403/C_1.scala | 5 | ||||
-rw-r--r-- | test/files/run/t9403/Test_2.scala | 29 |
3 files changed, 35 insertions, 0 deletions
diff --git a/test/files/run/t9403.flags b/test/files/run/t9403.flags new file mode 100644 index 0000000000..307668060c --- /dev/null +++ b/test/files/run/t9403.flags @@ -0,0 +1 @@ +-Ybackend:GenASM -optimize diff --git a/test/files/run/t9403/C_1.scala b/test/files/run/t9403/C_1.scala new file mode 100644 index 0000000000..439af1a386 --- /dev/null +++ b/test/files/run/t9403/C_1.scala @@ -0,0 +1,5 @@ +package p +class C { + @inline final def f(x: Int): Long = 10L / (if (x < 0) -2 else 2) + @inline final def g(x: Int): Long = 3000L / (if (x < 0) -300 else 300) +} diff --git a/test/files/run/t9403/Test_2.scala b/test/files/run/t9403/Test_2.scala new file mode 100644 index 0000000000..fb2777b9a8 --- /dev/null +++ b/test/files/run/t9403/Test_2.scala @@ -0,0 +1,29 @@ +import p.C +import scala.tools.asm.Opcodes +import scala.tools.partest.BytecodeTest +import scala.tools.partest.ASMConverters._ + + +object Test extends BytecodeTest { + def foo(c: C, x: Int) = c.f(x) + def goo(c: C, x: Int) = c.g(x) + + def has(i: Instruction, c: String, m: String) = { + val cls = loadClassNode(c) + val mth = convertMethod(getMethod(cls, m)) + assert(mth.instructions.contains(i)) + } + + def show(): Unit = { + assert(foo(new C, -2) == -5L) + assert(goo(new C, -2) == -10L) + + val bipush2 = IntOp(Opcodes.BIPUSH, -2) + has(bipush2, "p.C", "f") + has(bipush2, "Test$", "foo") + + val sipush300 = IntOp(Opcodes.SIPUSH, -300) + has(sipush300, "p.C", "g") + has(sipush300, "Test$", "goo") + } +} |