Skip to content

Commit

Permalink
Fix issue in no-standard [new] instruction replace
Browse files Browse the repository at this point in the history
A standard *new* construct bytecode will generate like:

```
new okhttp3/OkHttpClient
dup
invokespecial okhttp3/OkHttpClient <init> ()V
astore 1
```

but a few part of compiler will generate no-standard bytecode like:

```
new okhttp3/OkHttpClient
dup
astore 1
invokespecial okhttp3/OkHttpClient <init> ()V
```
which will cause javassist build stack error.

This commit will fix it
  • Loading branch information
catsalty authored Mar 16, 2023
1 parent 700be6f commit e447071
Showing 1 changed file with 14 additions and 1 deletion.
15 changes: 14 additions & 1 deletion src/main/javassist/expr/NewExpr.java
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,14 @@ public void replace(String statement) throws CannotCompileException {
*/
int codeSize = canReplace();
int end = pos + codeSize;
//check isStoreBeforeInit ,such as : new xx/xx ; dup;[astoreN];invokespecial xx/xx;
int beforeStoreOp = 0;
int preOp = iterator.byteAt(currentPos - 1);
if (iterator.byteAt(newPos + 3) == Opcode.DUP
&& (preOp >= Opcode.ASTORE_0
&& preOp <= Opcode.ASTORE_3) && currentPos - newPos == 5) {
beforeStoreOp = preOp;
}
for (int i = pos; i < end; ++i)
iterator.writeByte(NOP, i);

Expand Down Expand Up @@ -230,7 +238,12 @@ public void replace(String statement) throws CannotCompileException {
if (codeSize > 3) // if the original code includes DUP.
bytecode.addAload(retVar);

replace0(pos, bytecode, bytecodeSize);
if (beforeStoreOp >= Opcode.ASTORE_0) {
bytecode.addOpcode(beforeStoreOp);
replace0(pos - 1, bytecode, bytecodeSize + 1);
} else {
replace0(pos, bytecode, bytecodeSize);
}
}
catch (CompileError e) { throw new CannotCompileException(e); }
catch (NotFoundException e) { throw new CannotCompileException(e); }
Expand Down

0 comments on commit e447071

Please sign in to comment.