Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c63f1acce5 | ||
|
|
c06079058e | ||
|
|
e1b9766a53 |
No files matched your search
@@ -0,0 +1,13 @@
|
|||||||
|
import java.lang.Boolean;
|
||||||
|
import java.lang.Integer;
|
||||||
|
import java.lang.System;
|
||||||
|
import java.io.PrintStream;
|
||||||
|
|
||||||
|
public class Bug436 {
|
||||||
|
public not(Boolean b) {
|
||||||
|
return !b;
|
||||||
|
}
|
||||||
|
public not(Integer i) {
|
||||||
|
return ~i;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -735,6 +735,13 @@ public class Codegen {
|
|||||||
case TargetUnaryOp.Not not -> {
|
case TargetUnaryOp.Not not -> {
|
||||||
generate(state, not.expr());
|
generate(state, not.expr());
|
||||||
convertTo(state, not.expr().type(), TargetType.boolean_);
|
convertTo(state, not.expr().type(), TargetType.boolean_);
|
||||||
|
mv.visitInsn(ICONST_1);
|
||||||
|
mv.visitInsn(IXOR);
|
||||||
|
boxPrimitive(state, TargetType.toPrimitive(not.expr().type()));
|
||||||
|
}
|
||||||
|
case TargetUnaryOp.BNot not -> {
|
||||||
|
generate(state, not.expr());
|
||||||
|
convertTo(state, not.expr().type(), TargetType.toPrimitive(not.expr().type()));
|
||||||
if (not.type().equals(TargetType.Long)) {
|
if (not.type().equals(TargetType.Long)) {
|
||||||
mv.visitLdcInsn(-1L);
|
mv.visitLdcInsn(-1L);
|
||||||
mv.visitInsn(LXOR);
|
mv.visitInsn(LXOR);
|
||||||
|
|||||||
@@ -987,6 +987,9 @@ public class StatementGenerator {
|
|||||||
} else if (op.getText().equals("-")) {
|
} else if (op.getText().equals("-")) {
|
||||||
ret = new UnaryExpr(UnaryExpr.Operation.MINUS, expr, TypePlaceholder.fresh(op), op);
|
ret = new UnaryExpr(UnaryExpr.Operation.MINUS, expr, TypePlaceholder.fresh(op), op);
|
||||||
return ret;
|
return ret;
|
||||||
|
} else if (op.getText().equals("~")) {
|
||||||
|
ret = new UnaryExpr(UnaryExpr.Operation.BNOT, expr, TypePlaceholder.fresh(op), op);
|
||||||
|
return ret;
|
||||||
} else {
|
} else {
|
||||||
throw new NotImplementedException(op.getText());
|
throw new NotImplementedException(op.getText());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import org.antlr.v4.runtime.Token;
|
|||||||
public class UnaryExpr extends JavaInternalExpression
|
public class UnaryExpr extends JavaInternalExpression
|
||||||
{
|
{
|
||||||
public enum Operation{
|
public enum Operation{
|
||||||
|
BNOT,
|
||||||
NOT,
|
NOT,
|
||||||
MINUS,
|
MINUS,
|
||||||
PREINCREMENT,
|
PREINCREMENT,
|
||||||
|
|||||||
@@ -425,6 +425,7 @@ public class StatementToTargetExpression implements ASTVisitor {
|
|||||||
@Override
|
@Override
|
||||||
public void visit(UnaryExpr unaryExpr) {
|
public void visit(UnaryExpr unaryExpr) {
|
||||||
result = switch (unaryExpr.operation) {
|
result = switch (unaryExpr.operation) {
|
||||||
|
case BNOT -> new TargetUnaryOp.BNot(converter.convert(unaryExpr.getType(), generics), converter.convert(unaryExpr.expr, generics));
|
||||||
case NOT -> new TargetUnaryOp.Not(converter.convert(unaryExpr.getType(), generics), converter.convert(unaryExpr.expr, generics));
|
case NOT -> new TargetUnaryOp.Not(converter.convert(unaryExpr.getType(), generics), converter.convert(unaryExpr.expr, generics));
|
||||||
case MINUS -> new TargetUnaryOp.Negate(converter.convert(unaryExpr.getType(), generics), converter.convert(unaryExpr.expr, generics));
|
case MINUS -> new TargetUnaryOp.Negate(converter.convert(unaryExpr.getType(), generics), converter.convert(unaryExpr.expr, generics));
|
||||||
case PREINCREMENT -> new TargetUnaryOp.PreIncrement(converter.convert(unaryExpr.getType(), generics), converter.convert(unaryExpr.expr, generics));
|
case PREINCREMENT -> new TargetUnaryOp.PreIncrement(converter.convert(unaryExpr.getType(), generics), converter.convert(unaryExpr.expr, generics));
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ public sealed interface TargetUnaryOp extends TargetExpression {
|
|||||||
|
|
||||||
record Negate(TargetType type, TargetExpression expr) implements TargetUnaryOp {}
|
record Negate(TargetType type, TargetExpression expr) implements TargetUnaryOp {}
|
||||||
record Add(TargetType type, TargetExpression expr) implements TargetUnaryOp {}
|
record Add(TargetType type, TargetExpression expr) implements TargetUnaryOp {}
|
||||||
|
record BNot(TargetType type, TargetExpression expr) implements TargetUnaryOp {}
|
||||||
record Not(TargetType type, TargetExpression expr) implements TargetUnaryOp {}
|
record Not(TargetType type, TargetExpression expr) implements TargetUnaryOp {}
|
||||||
|
|
||||||
record PreIncrement(TargetType type, TargetExpression expr) implements TargetStatementExpression, TargetUnaryOp {}
|
record PreIncrement(TargetType type, TargetExpression expr) implements TargetStatementExpression, TargetUnaryOp {}
|
||||||
|
|||||||
@@ -254,7 +254,7 @@ public class TYPEStmt implements StatementVisitor {
|
|||||||
} else if (unaryExpr.operation == UnaryExpr.Operation.NOT) {
|
} else if (unaryExpr.operation == UnaryExpr.Operation.NOT) {
|
||||||
constraintsSet.addUndConstraint(new Pair(unaryExpr.expr.getType(), unaryExpr.getType(), PairOperator.EQUALSDOT, loc(unaryExpr.getOffset())));
|
constraintsSet.addUndConstraint(new Pair(unaryExpr.expr.getType(), unaryExpr.getType(), PairOperator.EQUALSDOT, loc(unaryExpr.getOffset())));
|
||||||
constraintsSet.addUndConstraint(new Pair(unaryExpr.expr.getType(), new RefType(ASTFactory.createClass(java.lang.Boolean.class).getClassName(), new NullToken()), PairOperator.EQUALSDOT, loc(unaryExpr.getOffset())));
|
constraintsSet.addUndConstraint(new Pair(unaryExpr.expr.getType(), new RefType(ASTFactory.createClass(java.lang.Boolean.class).getClassName(), new NullToken()), PairOperator.EQUALSDOT, loc(unaryExpr.getOffset())));
|
||||||
} else if (unaryExpr.operation == UnaryExpr.Operation.MINUS) {
|
} else if (unaryExpr.operation == UnaryExpr.Operation.MINUS || unaryExpr.operation == UnaryExpr.Operation.BNOT) {
|
||||||
constraintsSet.addUndConstraint(new Pair(unaryExpr.expr.getType(), number, PairOperator.SMALLERDOT, loc(unaryExpr.getOffset())));
|
constraintsSet.addUndConstraint(new Pair(unaryExpr.expr.getType(), number, PairOperator.SMALLERDOT, loc(unaryExpr.getOffset())));
|
||||||
constraintsSet.addUndConstraint(new Pair(unaryExpr.expr.getType(), unaryExpr.getType(), PairOperator.EQUALSDOT, loc(unaryExpr.getOffset())));
|
constraintsSet.addUndConstraint(new Pair(unaryExpr.expr.getType(), unaryExpr.getType(), PairOperator.EQUALSDOT, loc(unaryExpr.getOffset())));
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -1792,4 +1792,18 @@ public class TestComplete {
|
|||||||
var len = clazz.getDeclaredMethod("len", L);
|
var len = clazz.getDeclaredMethod("len", L);
|
||||||
assertEquals(3, len.invoke(null, list));
|
assertEquals(3, len.invoke(null, list));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testBug436() throws Exception {
|
||||||
|
var classFiles = generateClassFiles(createClassLoader(), "Bug436.jav");
|
||||||
|
var clazz = classFiles.get("Bug436");
|
||||||
|
var instance = clazz.getDeclaredConstructor().newInstance();
|
||||||
|
|
||||||
|
var not = clazz.getDeclaredMethod("not", Boolean.class);
|
||||||
|
assertEquals(false, not.invoke(instance, true));
|
||||||
|
assertEquals(true, not.invoke(instance, false));
|
||||||
|
|
||||||
|
var bnot = clazz.getDeclaredMethod("not", Integer.class);
|
||||||
|
assertEquals(-11, bnot.invoke(instance, 10));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -143,7 +143,7 @@ public class TestCodegen {
|
|||||||
public void testUnary() throws Exception {
|
public void testUnary() throws Exception {
|
||||||
var targetClass = new TargetClass(Opcodes.ACC_PUBLIC, new JavaClassName("Unary"));
|
var targetClass = new TargetClass(Opcodes.ACC_PUBLIC, new JavaClassName("Unary"));
|
||||||
|
|
||||||
targetClass.addMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC, "not", List.of(new MethodParameter(TargetType.Integer, "a")), TargetType.Integer, new TargetBlock(List.of(new TargetReturn(new TargetUnaryOp.Not(TargetType.Integer, new TargetLocalVar(TargetType.Integer, "a"))))));
|
targetClass.addMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC, "not", List.of(new MethodParameter(TargetType.Integer, "a")), TargetType.Integer, new TargetBlock(List.of(new TargetReturn(new TargetUnaryOp.BNot(TargetType.Integer, new TargetLocalVar(TargetType.Integer, "a"))))));
|
||||||
targetClass.addMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC, "neg", List.of(new MethodParameter(TargetType.Integer, "a")), TargetType.Integer, new TargetBlock(List.of(new TargetReturn(new TargetUnaryOp.Negate(TargetType.Integer, new TargetLocalVar(TargetType.Integer, "a"))))));
|
targetClass.addMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC, "neg", List.of(new MethodParameter(TargetType.Integer, "a")), TargetType.Integer, new TargetBlock(List.of(new TargetReturn(new TargetUnaryOp.Negate(TargetType.Integer, new TargetLocalVar(TargetType.Integer, "a"))))));
|
||||||
targetClass.addMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC, "add", List.of(new MethodParameter(TargetType.Integer, "a")), TargetType.Integer, new TargetBlock(List.of(new TargetReturn(new TargetUnaryOp.Add(TargetType.Integer, new TargetLocalVar(TargetType.Integer, "a"))))));
|
targetClass.addMethod(Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC, "add", List.of(new MethodParameter(TargetType.Integer, "a")), TargetType.Integer, new TargetBlock(List.of(new TargetReturn(new TargetUnaryOp.Add(TargetType.Integer, new TargetLocalVar(TargetType.Integer, "a"))))));
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user