-
Notifications
You must be signed in to change notification settings - Fork 3.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
SI-9403 fix ICodeReader for negative BIPUSH / SIPUSH values
The byte value of a BIPUSH instruction and the (byte1 << 8) | byte2 value of a SIPUSH instruction are signed, see [1] and [2]. Similar for the increment value of IINC [3]. [1] https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.bipush [2] https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.sipush [3] https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.iinc
- Loading branch information
Showing
5 changed files
with
49 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
-Ybackend:GenASM -optimize |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
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 bar(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 hasBiPush2(m: Method) = { | ||
assert(m.instructions exists { | ||
case IntOp(Opcodes.BIPUSH, -2) => true | ||
case _ => false | ||
}) | ||
} | ||
|
||
|
||
def show(): Unit = { | ||
assert(foo(new C, -2) == -5L) | ||
assert(bar(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$", "bar") | ||
} | ||
} |