azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

generate augmented assignment for number primitives via intrinsics

Browse Source
This commit is contained in:
Dmitry Jemerov
2011-07-14 20:41:03 +02:00
parent 8b1118f907
commit bf5a525748
2 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+4 -22
View File
@@ -1228,21 +1228,6 @@ public class ExpressionCodegen extends JetVisitor {
return JetTypeMapper.isIntPrimitive(type) || type == Type.FLOAT_TYPE || type == Type.DOUBLE_TYPE || type == Type.LONG_TYPE;
}
private static int opcodeForMethod(final String name) {
if (name.equals("plus")) return Opcodes.IADD;
if (name.equals("minus")) return Opcodes.ISUB;
if (name.equals("times")) return Opcodes.IMUL;
if (name.equals("div")) return Opcodes.IDIV;
if (name.equals("mod")) return Opcodes.IREM;
if (name.equals("shl")) return Opcodes.ISHL;
if (name.equals("shr")) return Opcodes.ISHR;
if (name.equals("ushr")) return Opcodes.IUSHR;
if (name.equals("and")) return Opcodes.IAND;
if (name.equals("or")) return Opcodes.IOR;
if (name.equals("xor")) return Opcodes.IXOR;
throw new UnsupportedOperationException("Don't know how to generate binary op method " + name);
}
private void generateCompareOp(JetExpression left, JetExpression right, IElementType opToken, Type operandType) {
gen(left, operandType);
gen(right, operandType);
@@ -1270,19 +1255,16 @@ public class ExpressionCodegen extends JetVisitor {
final JetExpression lhs = expression.getLeft();
Type lhsType = expressionType(lhs);
if (bindingContext.isVariableReassignment(expression)) {
if (isNumberPrimitive(lhsType)) {
if (callable instanceof IntrinsicMethod) {
StackValue value = generateIntermediateValue(lhs); // receiver
value.dupReceiver(v, 0); // receiver receiver
value.put(lhsType, v); // receiver lhs
genToJVMStack(expression.getRight()); // receiver lhs rhs
v.visitInsn(lhsType.getOpcode(opcodeForMethod(op.getName()))); // receiver result
final IntrinsicMethod intrinsic = (IntrinsicMethod) callable;
intrinsic.generate(this, v, lhsType, expression, Arrays.asList(lhs, expression.getRight()), true);
value.store(v);
}
else if (callable instanceof CallableMethod) {
callAugAssignMethod(expression, (CallableMethod) callable, lhsType, true);
}
else {
throw new UnsupportedOperationException("Augmented assignment for non-primitive types not yet implemented");
callAugAssignMethod(expression, (CallableMethod) callable, lhsType, true);
}
}
else {
idea/src/org/jetbrains/jet/codegen/intrinsics/BinaryOp.java
+3 -1
View File
@@ -21,7 +21,9 @@ public class BinaryOp implements IntrinsicMethod {
@Override
public StackValue generate(ExpressionCodegen codegen, InstructionAdapter v, Type expectedType, PsiElement element, List<JetExpression> arguments, boolean haveReceiver) {
codegen.gen(arguments.get(0), expectedType);
if (!haveReceiver) {
codegen.gen(arguments.get(0), expectedType);
}
codegen.gen(arguments.get(1), expectedType);
v.visitInsn(expectedType.getOpcode(opcode));
return StackValue.onStack(expectedType);