Skip to content

Commit 96b9655

Browse files
committed
[#24] Fixed issue
+ disabled stack traces trimming by surefire plugin + refactored SmtIf* cases + fixed NPE in MethodVisitorRecorder
1 parent 04701c3 commit 96b9655

30 files changed

Lines changed: 485 additions & 228 deletions

atom-codegen/src/main/java/oo/atom/codegen/bytebuddy/branching/BIfAcmpEq.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
*
3131
* @author Kapralov Sergey
3232
*/
33-
public class BIfAcmpEq extends Base {
33+
public class BIfAcmpEq extends BImpl {
3434

3535
public BIfAcmpEq(Label label) {
3636
super(-2, 0, label, Opcodes.IF_ACMPEQ);

atom-codegen/src/main/java/oo/atom/codegen/bytebuddy/branching/BIfAcmpNe.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
*
3131
* @author Kapralov Sergey
3232
*/
33-
public class BIfAcmpNe extends Base {
33+
public class BIfAcmpNe extends BImpl {
3434

3535
public BIfAcmpNe(Label label) {
3636
super(-2, 0, label, Opcodes.IF_ACMPNE);

atom-codegen/src/main/java/oo/atom/codegen/bytebuddy/branching/BIfEq.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
*
3131
* @author Kapralov Sergey
3232
*/
33-
public class BIfEq extends Base {
33+
public class BIfEq extends BImpl {
3434

3535
public BIfEq(Label label) {
3636
super(-1, 0, label, Opcodes.IFEQ);

atom-codegen/src/main/java/oo/atom/codegen/bytebuddy/branching/BIfIcmpEq.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
*
3131
* @author Kapralov Sergey
3232
*/
33-
public class BIfIcmpEq extends Base {
33+
public class BIfIcmpEq extends BImpl {
3434

3535
public BIfIcmpEq(Label label) {
3636
super(-2, 0, label, Opcodes.IF_ICMPEQ);

atom-codegen/src/main/java/oo/atom/codegen/bytebuddy/branching/BIfIcmpNe.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
*
3131
* @author Kapralov Sergey
3232
*/
33-
public class BIfIcmpNe extends Base {
33+
public class BIfIcmpNe extends BImpl {
3434

3535
public BIfIcmpNe(Label label) {
3636
super(-2, 0, label, Opcodes.IF_ICMPNE);

atom-codegen/src/main/java/oo/atom/codegen/bytebuddy/branching/BIfNe.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*
1+
/*
22
* The MIT License
33
*
44
* Copyright 2017 Kapralov Sergey.
@@ -30,7 +30,7 @@
3030
*
3131
* @author Kapralov Sergey
3232
*/
33-
public class BIfNe extends Base {
33+
public class BIfNe extends BImpl {
3434

3535
public BIfNe(Label label) {
3636
super(-1, 0, label, Opcodes.IFNE);

atom-codegen/src/main/java/oo/atom/codegen/bytebuddy/branching/BIfNonNull.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
*
3131
* @author Kapralov Sergey
3232
*/
33-
public class BIfNonNull extends Base {
33+
public class BIfNonNull extends BImpl {
3434

3535
public BIfNonNull(Label label) {
3636
super(-1, 0, label, Opcodes.IFNONNULL);

atom-codegen/src/main/java/oo/atom/codegen/bytebuddy/branching/BIfNull.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
*
3131
* @author Kapralov Sergey
3232
*/
33-
public class BIfNull extends Base {
33+
public class BIfNull extends BImpl {
3434

3535
public BIfNull(Label label) {
3636
super(-1, 0, label, Opcodes.IFNULL);

atom-codegen/src/main/java/oo/atom/codegen/bytebuddy/branching/Base.java renamed to atom-codegen/src/main/java/oo/atom/codegen/bytebuddy/branching/BImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@
3232
*
3333
* @author Kapralov Sergey
3434
*/
35-
public class Base implements Branching {
35+
public class BImpl implements Branching {
3636

3737
private final int sizeImpact;
3838
private final int maxSize;
3939
private final Label label;
4040
private final int opcode;
4141

42-
public Base(int sizeImpact, int maxSize, Label label, int opcode) {
42+
public BImpl(int sizeImpact, int maxSize, Label label, int opcode) {
4343
this.sizeImpact = sizeImpact;
4444
this.maxSize = maxSize;
4545
this.label = label;

atom-codegen/src/main/java/oo/atom/codegen/bytebuddy/smt/SmtFieldEquality.java renamed to atom-codegen/src/main/java/oo/atom/codegen/bytebuddy/smt/SmtCheckFieldEquality.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
*
3131
* @author Kapralov Sergey
3232
*/
33-
public class SmtFieldEquality extends SmtCombined {
34-
public SmtFieldEquality(final TypeDescription type, final FieldDescription field) {
33+
public class SmtCheckFieldEquality extends SmtCombined {
34+
public SmtCheckFieldEquality(final TypeDescription type, final FieldDescription field) {
3535
super(
3636
new SmtLoadPairOfFields(type, field),
37-
new SmtIfEqual(true, new SmtReturnInteger(0))
37+
new SmtIfNotEqual(field.getType().asErasure(), new SmtReturnInteger(0))
3838
);
3939
}
4040
}

0 commit comments

Comments
 (0)