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

Reorganize JVM intrinsics

Browse Source 
Make IntrinsicMethod an abstract class, coerce the resulting value of the
intrinsic to the expected type
This commit is contained in:
Alexander Udalov
2013-12-12 21:23:14 +04:00
parent 24678f189e
commit 11f33c9399
38 changed files with 251 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+5 -5
View File
@@ -1626,7 +1626,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
IntrinsicMethod intrinsic = state.getIntrinsics().getIntrinsic(memberDescriptor);
if (intrinsic != null) {
Type returnType = typeMapper.mapType(memberDescriptor);
intrinsic.generate(this, v, returnType, expression, Collections.<JetExpression>emptyList(), receiver, state);
intrinsic.generate(this, v, returnType, expression, Collections.<JetExpression>emptyList(), receiver);
return StackValue.onStack(returnType);
}
}
@@ -2010,7 +2010,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
Type returnType = typeMapper.mapType(resolvedCall.getResultingDescriptor());
intrinsic.generate(this, v, returnType, call.getCallElement(), args, receiver, state);
intrinsic.generate(this, v, returnType, call.getCallElement(), args, receiver);
return StackValue.onStack(returnType);
}
}
@@ -2650,7 +2650,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
//noinspection ConstantConditions
Type returnType = typeMapper.mapType(resolvedCall.getResultingDescriptor());
((IntrinsicMethod) callable).generate(this, v, returnType, expression,
Arrays.asList(expression.getLeft(), expression.getRight()), receiver, state);
Arrays.asList(expression.getLeft(), expression.getRight()), receiver);
return StackValue.onStack(returnType);
}
else {
@@ -2897,7 +2897,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
JetExpression right = expression.getRight();
assert right != null;
Type returnType = typeMapper.mapType((FunctionDescriptor) op);
intrinsic.generate(this, v, returnType, expression, Collections.singletonList(right), StackValue.onStack(lhsType), state);
intrinsic.generate(this, v, returnType, expression, Collections.singletonList(right), StackValue.onStack(lhsType));
value.store(lhsType, v);
}
else {
@@ -2984,7 +2984,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
if (callable instanceof IntrinsicMethod) {
Type returnType = typeMapper.mapType((FunctionDescriptor) op);
((IntrinsicMethod) callable).generate(this, v, returnType, expression,
Collections.singletonList(expression.getBaseExpression()), receiver, state);
Collections.singletonList(expression.getBaseExpression()), receiver);
return StackValue.onStack(returnType);
}
compiler/backend/src/org/jetbrains/jet/codegen/StackValue.java
+2 -2
View File
@@ -632,7 +632,7 @@ public abstract class StackValue {
((CallableMethod) getter).invokeWithNotNullAssertion(v, state, resolvedGetCall);
}
else {
((IntrinsicMethod) getter).generate(codegen, v, this.type, null, null, null, state);
((IntrinsicMethod) getter).generate(codegen, v, this.type, null, null, null);
}
coerceTo(type, v);
}
@@ -655,7 +655,7 @@ public abstract class StackValue {
}
else {
//noinspection ConstantConditions
((IntrinsicMethod) setter).generate(codegen, v, null, null, null, null, state);
((IntrinsicMethod) setter).generate(codegen, v, null, null, null, null);
}
}
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/ArrayGet.java
+5 -9
View File
@@ -22,24 +22,22 @@ import org.jetbrains.asm4.Type;
import org.jetbrains.asm4.commons.InstructionAdapter;
import org.jetbrains.jet.codegen.ExpressionCodegen;
import org.jetbrains.jet.codegen.StackValue;
import org.jetbrains.jet.codegen.state.GenerationState;
import org.jetbrains.jet.lang.psi.JetExpression;
import org.jetbrains.jet.lang.resolve.java.AsmTypeConstants;
import java.util.List;
import static org.jetbrains.jet.codegen.AsmUtil.correctElementType;
public class ArrayGet implements IntrinsicMethod {
public class ArrayGet extends IntrinsicMethod {
@NotNull
@Override
public StackValue generate(
public Type generateImpl(
ExpressionCodegen codegen,
InstructionAdapter v,
@NotNull Type returnType,
PsiElement element,
List<JetExpression> arguments,
StackValue receiver,
@NotNull GenerationState state
StackValue receiver
) {
receiver.put(receiver.type, v);
Type type = correctElementType(receiver.type);
@@ -48,8 +46,6 @@ public class ArrayGet implements IntrinsicMethod {
v.aload(type);
StackValue.coerce(type, returnType, v);
return StackValue.onStack(returnType);
return type;
}
}
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/ArrayIndices.java
+5 -7
View File
@@ -22,28 +22,26 @@ import org.jetbrains.asm4.Type;
import org.jetbrains.asm4.commons.InstructionAdapter;
import org.jetbrains.jet.codegen.ExpressionCodegen;
import org.jetbrains.jet.codegen.StackValue;
import org.jetbrains.jet.codegen.state.GenerationState;
import org.jetbrains.jet.lang.psi.JetExpression;
import java.util.List;
import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.JET_INT_RANGE_TYPE;
public class ArrayIndices implements IntrinsicMethod {
public class ArrayIndices extends IntrinsicMethod {
@NotNull
@Override
public StackValue generate(
public Type generateImpl(
ExpressionCodegen codegen,
InstructionAdapter v,
@NotNull Type returnType,
PsiElement element,
List<JetExpression> arguments,
StackValue receiver,
@NotNull GenerationState state
StackValue receiver
) {
receiver.put(receiver.type, v);
v.arraylength();
v.invokestatic("jet/runtime/Ranges", "arrayIndices", "(I)Ljet/IntRange;");
StackValue.coerce(JET_INT_RANGE_TYPE, returnType, v);
return StackValue.onStack(returnType);
return JET_INT_RANGE_TYPE;
}
}
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/ArrayIterator.java
+8 -10
View File
@@ -22,7 +22,6 @@ import org.jetbrains.asm4.Type;
import org.jetbrains.asm4.commons.InstructionAdapter;
import org.jetbrains.jet.codegen.ExpressionCodegen;
import org.jetbrains.jet.codegen.StackValue;
import org.jetbrains.jet.codegen.state.GenerationState;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
import org.jetbrains.jet.lang.psi.JetCallExpression;
@@ -34,22 +33,23 @@ import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.lang.types.lang.PrimitiveType;
import java.util.Iterator;
import java.util.List;
import static org.jetbrains.jet.codegen.AsmUtil.asmDescByFqNameWithoutInnerClasses;
import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.JET_ITERATOR_TYPE;
import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.getType;
import static org.jetbrains.jet.lang.resolve.java.mapping.PrimitiveTypesUtil.asmTypeForPrimitive;
public class ArrayIterator implements IntrinsicMethod {
public class ArrayIterator extends IntrinsicMethod {
@NotNull
@Override
public StackValue generate(
public Type generateImpl(
ExpressionCodegen codegen,
InstructionAdapter v,
@NotNull Type returnType,
PsiElement element,
List<JetExpression> arguments,
StackValue receiver,
@NotNull GenerationState state
StackValue receiver
) {
receiver.put(receiver.type, v);
JetCallExpression call = (JetCallExpression) element;
@@ -59,8 +59,7 @@ public class ArrayIterator implements IntrinsicMethod {
ClassDescriptor containingDeclaration = (ClassDescriptor) funDescriptor.getContainingDeclaration().getOriginal();
if (containingDeclaration.equals(KotlinBuiltIns.getInstance().getArray())) {
v.invokestatic("jet/runtime/ArrayIterator", "iterator", "([Ljava/lang/Object;)Ljava/util/Iterator;");
StackValue.coerce(JET_ITERATOR_TYPE, returnType, v);
return StackValue.onStack(returnType);
return getType(Iterator.class);
}
for (JvmPrimitiveType jvmPrimitiveType : JvmPrimitiveType.values()) {
@@ -70,8 +69,7 @@ public class ArrayIterator implements IntrinsicMethod {
String iteratorDesc = asmDescByFqNameWithoutInnerClasses(new FqName("jet." + primitiveType.getTypeName() + "Iterator"));
String methodSignature = "([" + asmTypeForPrimitive(jvmPrimitiveType) + ")" + iteratorDesc;
v.invokestatic("jet/runtime/ArrayIterator", "iterator", methodSignature);
StackValue.coerce(Type.getType(iteratorDesc), returnType, v);
return StackValue.onStack(returnType);
return Type.getType(iteratorDesc);
}
}
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/ArraySet.java
+5 -9
View File
@@ -22,23 +22,22 @@ import org.jetbrains.asm4.Type;
import org.jetbrains.asm4.commons.InstructionAdapter;
import org.jetbrains.jet.codegen.ExpressionCodegen;
import org.jetbrains.jet.codegen.StackValue;
import org.jetbrains.jet.codegen.state.GenerationState;
import org.jetbrains.jet.lang.psi.JetExpression;
import java.util.List;
import static org.jetbrains.jet.codegen.AsmUtil.correctElementType;
public class ArraySet implements IntrinsicMethod {
public class ArraySet extends IntrinsicMethod {
@NotNull
@Override
public StackValue generate(
public Type generateImpl(
ExpressionCodegen codegen,
InstructionAdapter v,
@NotNull Type returnType,
PsiElement element,
List<JetExpression> arguments,
StackValue receiver,
@NotNull GenerationState state
StackValue receiver
) {
receiver.put(receiver.type, v);
Type type = correctElementType(receiver.type);
@@ -47,9 +46,6 @@ public class ArraySet implements IntrinsicMethod {
codegen.gen(arguments.get(1), type);
v.astore(type);
StackValue.coerce(Type.VOID_TYPE, returnType, v);
return StackValue.onStack(returnType);
return Type.VOID_TYPE;
}
}
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/ArraySize.java
+5 -9
View File
@@ -20,29 +20,25 @@ import com.intellij.psi.PsiElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.asm4.Type;
import org.jetbrains.asm4.commons.InstructionAdapter;
import org.jetbrains.jet.lang.resolve.java.AsmTypeConstants;
import org.jetbrains.jet.codegen.ExpressionCodegen;
import org.jetbrains.jet.codegen.StackValue;
import org.jetbrains.jet.codegen.state.GenerationState;
import org.jetbrains.jet.lang.psi.JetExpression;
import java.util.List;
public class ArraySize implements IntrinsicMethod {
public class ArraySize extends IntrinsicMethod {
@NotNull
@Override
public StackValue generate(
public Type generateImpl(
ExpressionCodegen codegen,
InstructionAdapter v,
@NotNull Type returnType,
PsiElement element,
List<JetExpression> arguments,
StackValue receiver,
@NotNull GenerationState state
StackValue receiver
) {
receiver.put(receiver.type, v);
v.arraylength();
StackValue.coerce(Type.INT_TYPE, returnType, v);
return StackValue.onStack(returnType);
return Type.INT_TYPE;
}
}
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/BinaryOp.java
+7 -12
View File
@@ -22,36 +22,32 @@ import org.jetbrains.asm4.Type;
import org.jetbrains.asm4.commons.InstructionAdapter;
import org.jetbrains.jet.codegen.ExpressionCodegen;
import org.jetbrains.jet.codegen.StackValue;
import org.jetbrains.jet.codegen.state.GenerationState;
import org.jetbrains.jet.lang.psi.JetExpression;
import java.util.List;
import static org.jetbrains.asm4.Opcodes.*;
import static org.jetbrains.jet.codegen.AsmUtil.boxType;
import static org.jetbrains.jet.codegen.AsmUtil.isPrimitive;
import static org.jetbrains.jet.codegen.AsmUtil.numberFunctionOperandType;
import static org.jetbrains.jet.codegen.AsmUtil.unboxType;
public class BinaryOp implements IntrinsicMethod {
public class BinaryOp extends IntrinsicMethod {
private final int opcode;
public BinaryOp(int opcode) {
this.opcode = opcode;
}
@NotNull
@Override
public StackValue generate(
public Type generateImpl(
ExpressionCodegen codegen,
InstructionAdapter v,
@NotNull Type returnType,
PsiElement element,
List<JetExpression> arguments,
StackValue receiver,
@NotNull GenerationState state
StackValue receiver
) {
boolean nullable = returnType.getSort() == Type.OBJECT;
assert !nullable : "Return type of BinaryOp intrinsic should be of primitive type : " + returnType;
assert isPrimitive(returnType) : "Return type of BinaryOp intrinsic should be of primitive type : " + returnType;
Type operandType = numberFunctionOperandType(returnType);
@@ -67,8 +63,7 @@ public class BinaryOp implements IntrinsicMethod {
codegen.gen(arguments.get(1), shift() ? Type.INT_TYPE : operandType);
}
v.visitInsn(returnType.getOpcode(opcode));
return StackValue.onStack(returnType);
return returnType;
}
private boolean shift() {
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/CompareTo.java
+5 -7
View File
@@ -23,23 +23,22 @@ import org.jetbrains.asm4.Type;
import org.jetbrains.asm4.commons.InstructionAdapter;
import org.jetbrains.jet.codegen.ExpressionCodegen;
import org.jetbrains.jet.codegen.StackValue;
import org.jetbrains.jet.codegen.state.GenerationState;
import org.jetbrains.jet.lang.psi.JetExpression;
import java.util.List;
import static org.jetbrains.jet.codegen.AsmUtil.comparisonOperandType;
public class CompareTo implements IntrinsicMethod {
public class CompareTo extends IntrinsicMethod {
@NotNull
@Override
public StackValue generate(
public Type generateImpl(
ExpressionCodegen codegen,
InstructionAdapter v,
@NotNull Type returnType,
@Nullable PsiElement element,
@Nullable List<JetExpression> arguments,
StackValue receiver,
@NotNull GenerationState state
StackValue receiver
) {
JetExpression argument;
assert arguments != null;
@@ -77,7 +76,6 @@ public class CompareTo implements IntrinsicMethod {
throw new UnsupportedOperationException();
}
StackValue.coerce(Type.INT_TYPE, returnType, v);
return StackValue.onStack(returnType);
return Type.INT_TYPE;
}
}
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Concat.java
+6 -7
View File
@@ -22,7 +22,6 @@ import org.jetbrains.asm4.Type;
import org.jetbrains.asm4.commons.InstructionAdapter;
import org.jetbrains.jet.codegen.ExpressionCodegen;
import org.jetbrains.jet.codegen.StackValue;
import org.jetbrains.jet.codegen.state.GenerationState;
import org.jetbrains.jet.lang.psi.JetExpression;
import org.jetbrains.jet.lang.resolve.java.AsmTypeConstants;
@@ -30,17 +29,18 @@ import java.util.List;
import static org.jetbrains.jet.codegen.AsmUtil.genInvokeAppendMethod;
import static org.jetbrains.jet.codegen.AsmUtil.genStringBuilderConstructor;
import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.JAVA_STRING_TYPE;
public class Concat implements IntrinsicMethod {
public class Concat extends IntrinsicMethod {
@NotNull
@Override
public StackValue generate(
public Type generateImpl(
ExpressionCodegen codegen,
InstructionAdapter v,
@NotNull Type returnType,
PsiElement element,
List<JetExpression> arguments,
StackValue receiver,
@NotNull GenerationState state
StackValue receiver
) {
if (receiver == null || receiver == StackValue.none()) { // LHS + RHS
genStringBuilderConstructor(v);
@@ -56,7 +56,6 @@ public class Concat implements IntrinsicMethod {
}
v.invokevirtual("java/lang/StringBuilder", "toString", "()Ljava/lang/String;");
StackValue.onStack(AsmTypeConstants.JAVA_STRING_TYPE).put(returnType, v);
return StackValue.onStack(returnType);
return JAVA_STRING_TYPE;
}
}
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/CopyToArray.java
+23 -8
View File
@@ -1,3 +1,19 @@
/*
* Copyright 2010-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.jet.codegen.intrinsics;
import com.intellij.psi.PsiElement;
@@ -7,21 +23,22 @@ import org.jetbrains.asm4.Type;
import org.jetbrains.asm4.commons.InstructionAdapter;
import org.jetbrains.jet.codegen.ExpressionCodegen;
import org.jetbrains.jet.codegen.StackValue;
import org.jetbrains.jet.codegen.state.GenerationState;
import org.jetbrains.jet.lang.psi.JetExpression;
import java.util.List;
public class CopyToArray implements IntrinsicMethod {
import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.getType;
public class CopyToArray extends IntrinsicMethod {
@NotNull
@Override
public StackValue generate(
public Type generateImpl(
ExpressionCodegen codegen,
InstructionAdapter v,
@NotNull Type returnType,
@Nullable PsiElement element,
@Nullable List<JetExpression> arguments,
@Nullable StackValue receiver,
@NotNull GenerationState state
@Nullable StackValue receiver
) {
assert receiver != null;
receiver.put(receiver.type, v);
@@ -31,8 +48,6 @@ public class CopyToArray implements IntrinsicMethod {
v.newarray(returnType.getElementType());
v.invokeinterface("java/util/Collection", "toArray", "([Ljava/lang/Object;)[Ljava/lang/Object;");
StackValue.coerce(Type.getType("[Ljava/lang/Object;"), returnType, v);
return StackValue.onStack(returnType);
return getType(Object[].class);
}
}
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/EnumValueOf.java
+10 -23
View File
@@ -21,37 +21,24 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.asm4.Type;
import org.jetbrains.asm4.commons.InstructionAdapter;
import org.jetbrains.jet.lang.resolve.java.AsmTypeConstants;
import org.jetbrains.jet.codegen.ExpressionCodegen;
import org.jetbrains.jet.codegen.StackValue;
import org.jetbrains.jet.codegen.state.GenerationState;
import org.jetbrains.jet.lang.descriptors.CallableDescriptor;
import org.jetbrains.jet.lang.psi.JetCallExpression;
import org.jetbrains.jet.lang.psi.JetExpression;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall;
import org.jetbrains.jet.lang.types.JetType;
import java.util.List;
public class EnumValueOf implements IntrinsicMethod {
import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.JAVA_STRING_TYPE;
public class EnumValueOf extends IntrinsicMethod {
@NotNull
@Override
public StackValue generate(
ExpressionCodegen codegen, InstructionAdapter v, @NotNull Type expectedType, @Nullable PsiElement element,
@Nullable List<JetExpression> arguments, StackValue receiver, @NotNull GenerationState state
public Type generateImpl(
ExpressionCodegen codegen, InstructionAdapter v, @NotNull Type returnType, @Nullable PsiElement element,
@Nullable List<JetExpression> arguments, StackValue receiver
) {
JetCallExpression call = (JetCallExpression) element;
ResolvedCall<? extends CallableDescriptor> resolvedCall =
codegen.getBindingContext().get(BindingContext.RESOLVED_CALL, call.getCalleeExpression());
assert resolvedCall != null;
CallableDescriptor resultingDescriptor = resolvedCall.getResultingDescriptor();
JetType returnType = resultingDescriptor.getReturnType();
assert returnType != null;
Type type = state.getTypeMapper().mapType(returnType);
assert arguments != null;
codegen.gen(arguments.get(0), AsmTypeConstants.JAVA_STRING_TYPE);
v.invokestatic(type.getInternalName(), "valueOf", "(Ljava/lang/String;)" + type.getDescriptor());
StackValue.onStack(type).put(expectedType, v);
return StackValue.onStack(expectedType);
codegen.gen(arguments.get(0), JAVA_STRING_TYPE);
v.invokestatic(returnType.getInternalName(), "valueOf", "(Ljava/lang/String;)" + returnType.getDescriptor());
return returnType;
}
}
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/EnumValues.java
+7 -21
View File
@@ -23,32 +23,18 @@ import org.jetbrains.asm4.Type;
import org.jetbrains.asm4.commons.InstructionAdapter;
import org.jetbrains.jet.codegen.ExpressionCodegen;
import org.jetbrains.jet.codegen.StackValue;
import org.jetbrains.jet.codegen.state.GenerationState;
import org.jetbrains.jet.lang.descriptors.CallableDescriptor;
import org.jetbrains.jet.lang.psi.JetCallExpression;
import org.jetbrains.jet.lang.psi.JetExpression;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall;
import org.jetbrains.jet.lang.types.JetType;
import java.util.List;
public class EnumValues implements IntrinsicMethod {
public class EnumValues extends IntrinsicMethod {
@NotNull
@Override
public StackValue generate(
ExpressionCodegen codegen, InstructionAdapter v, @NotNull Type expectedType, @Nullable PsiElement element,
@Nullable List<JetExpression> arguments, StackValue receiver, @NotNull GenerationState state
public Type generateImpl(
ExpressionCodegen codegen, InstructionAdapter v, @NotNull Type returnType, @Nullable PsiElement element,
@Nullable List<JetExpression> arguments, StackValue receiver
) {
JetCallExpression call = (JetCallExpression) element;
ResolvedCall<? extends CallableDescriptor> resolvedCall =
codegen.getBindingContext().get(BindingContext.RESOLVED_CALL, call.getCalleeExpression());
assert resolvedCall != null;
CallableDescriptor resultingDescriptor = resolvedCall.getResultingDescriptor();
JetType returnType = resultingDescriptor.getReturnType();
assert returnType != null;
Type type = state.getTypeMapper().mapType(returnType);
v.invokestatic(type.getElementType().getInternalName(), "values", "()" + type);
StackValue.onStack(type).put(expectedType, v);
return StackValue.onStack(expectedType);
v.invokestatic(returnType.getElementType().getInternalName(), "values", "()" + returnType);
return returnType;
}
}
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Equals.java
+9 -11
View File
@@ -22,26 +22,25 @@ import org.jetbrains.asm4.Type;
import org.jetbrains.asm4.commons.InstructionAdapter;
import org.jetbrains.jet.codegen.ExpressionCodegen;
import org.jetbrains.jet.codegen.StackValue;
import org.jetbrains.jet.codegen.state.GenerationState;
import org.jetbrains.jet.lang.psi.JetCallExpression;
import org.jetbrains.jet.lang.psi.JetExpression;
import org.jetbrains.jet.lang.resolve.java.AsmTypeConstants;
import org.jetbrains.jet.lexer.JetTokens;
import java.util.List;
import static org.jetbrains.jet.codegen.AsmUtil.genEqualsForExpressionsOnStack;
import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.OBJECT_TYPE;
public class Equals implements IntrinsicMethod {
public class Equals extends IntrinsicMethod {
@NotNull
@Override
public StackValue generate(
public Type generateImpl(
ExpressionCodegen codegen,
InstructionAdapter v,
@NotNull Type returnType,
PsiElement element,
List<JetExpression> arguments,
StackValue receiver,
@NotNull GenerationState state
StackValue receiver
) {
StackValue leftExpr;
JetExpression rightExpr;
@@ -54,11 +53,10 @@ public class Equals implements IntrinsicMethod {
rightExpr = arguments.get(1);
}
leftExpr.put(AsmTypeConstants.OBJECT_TYPE, v);
codegen.gen(rightExpr).put(AsmTypeConstants.OBJECT_TYPE, v);
leftExpr.put(OBJECT_TYPE, v);
codegen.gen(rightExpr).put(OBJECT_TYPE, v);
StackValue value = genEqualsForExpressionsOnStack(v, JetTokens.EQEQ, AsmTypeConstants.OBJECT_TYPE, AsmTypeConstants.OBJECT_TYPE);
value.put(returnType, v);
return StackValue.onStack(returnType);
genEqualsForExpressionsOnStack(v, JetTokens.EQEQ, OBJECT_TYPE, OBJECT_TYPE).put(returnType, v);
return returnType;
}
}
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/HashCode.java
+5 -7
View File
@@ -24,26 +24,24 @@ import org.jetbrains.asm4.Type;
import org.jetbrains.asm4.commons.InstructionAdapter;
import org.jetbrains.jet.codegen.ExpressionCodegen;
import org.jetbrains.jet.codegen.StackValue;
import org.jetbrains.jet.codegen.state.GenerationState;
import org.jetbrains.jet.lang.psi.JetExpression;
import org.jetbrains.jet.lang.resolve.java.AsmTypeConstants;
import java.util.List;
public class HashCode implements IntrinsicMethod {
public class HashCode extends IntrinsicMethod {
@NotNull
@Override
public StackValue generate(
public Type generateImpl(
ExpressionCodegen codegen,
InstructionAdapter v,
@NotNull Type returnType,
@Nullable PsiElement element,
@Nullable List<JetExpression> arguments,
StackValue receiver,
@NotNull GenerationState state
StackValue receiver
) {
receiver.put(AsmTypeConstants.OBJECT_TYPE, v);
v.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/Object", "hashCode", "()I");
StackValue.coerce(Type.INT_TYPE, returnType, v);
return StackValue.onStack(returnType);
return Type.INT_TYPE;
}
}
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IdentityEquals.java
+5 -6
View File
@@ -22,7 +22,6 @@ import org.jetbrains.asm4.Type;
import org.jetbrains.asm4.commons.InstructionAdapter;
import org.jetbrains.jet.codegen.ExpressionCodegen;
import org.jetbrains.jet.codegen.StackValue;
import org.jetbrains.jet.codegen.state.GenerationState;
import org.jetbrains.jet.lang.psi.JetBinaryExpression;
import org.jetbrains.jet.lang.psi.JetCallExpression;
import org.jetbrains.jet.lang.psi.JetExpression;
@@ -32,16 +31,16 @@ import java.util.List;
import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.OBJECT_TYPE;
public class IdentityEquals implements IntrinsicMethod {
public class IdentityEquals extends IntrinsicMethod {
@NotNull
@Override
public StackValue generate(
public Type generateImpl(
ExpressionCodegen codegen,
InstructionAdapter v,
@NotNull Type returnType,
PsiElement element,
List<JetExpression> arguments,
StackValue receiver,
@NotNull GenerationState state
StackValue receiver
) {
if (element instanceof JetCallExpression) {
receiver.put(OBJECT_TYPE, v);
@@ -54,6 +53,6 @@ public class IdentityEquals implements IntrinsicMethod {
codegen.gen(e.getRight()).put(OBJECT_TYPE, v);
}
StackValue.cmp(JetTokens.EQEQEQ, OBJECT_TYPE).put(returnType, v);
return StackValue.onStack(returnType);
return returnType;
}
}
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Increment.java
+9 -10
View File
@@ -22,7 +22,6 @@ import org.jetbrains.asm4.Type;
import org.jetbrains.asm4.commons.InstructionAdapter;
import org.jetbrains.jet.codegen.ExpressionCodegen;
import org.jetbrains.jet.codegen.StackValue;
import org.jetbrains.jet.codegen.state.GenerationState;
import org.jetbrains.jet.lang.psi.JetExpression;
import org.jetbrains.jet.lang.psi.JetParenthesizedExpression;
import org.jetbrains.jet.lang.psi.JetReferenceExpression;
@@ -30,27 +29,26 @@ import org.jetbrains.jet.lang.psi.JetReferenceExpression;
import java.util.List;
import static org.jetbrains.jet.codegen.AsmUtil.genIncrement;
import static org.jetbrains.jet.codegen.AsmUtil.unboxType;
import static org.jetbrains.jet.codegen.AsmUtil.isPrimitive;
public class Increment implements IntrinsicMethod {
public class Increment extends IntrinsicMethod {
private final int myDelta;
public Increment(int delta) {
myDelta = delta;
}
@NotNull
@Override
public StackValue generate(
public Type generateImpl(
ExpressionCodegen codegen,
InstructionAdapter v,
@NotNull Type returnType,
PsiElement element,
List<JetExpression> arguments,
StackValue receiver,
@NotNull GenerationState state
StackValue receiver
) {
boolean nullable = returnType.getSort() == Type.OBJECT;
assert !nullable : "Return type of Increment intrinsic should be of primitive type : " + returnType;
assert isPrimitive(returnType) : "Return type of Increment intrinsic should be of primitive type : " + returnType;
if (arguments.size() > 0) {
JetExpression operand = arguments.get(0);
@@ -61,7 +59,7 @@ public class Increment implements IntrinsicMethod {
int index = codegen.indexOfLocal((JetReferenceExpression) operand);
if (index >= 0) {
StackValue.preIncrement(index, myDelta).put(returnType, v);
return StackValue.onStack(returnType);
return returnType;
}
}
StackValue value = codegen.genQualified(receiver, operand);
@@ -77,6 +75,7 @@ public class Increment implements IntrinsicMethod {
receiver.put(returnType, v);
genIncrement(returnType, myDelta, v);
}
return StackValue.onStack(returnType);
return returnType;
}
}
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethod.java
+21 -5
View File
@@ -24,14 +24,30 @@ import org.jetbrains.asm4.commons.InstructionAdapter;
import org.jetbrains.jet.codegen.Callable;
import org.jetbrains.jet.codegen.ExpressionCodegen;
import org.jetbrains.jet.codegen.StackValue;
import org.jetbrains.jet.codegen.state.GenerationState;
import org.jetbrains.jet.lang.psi.JetExpression;
import java.util.List;
public interface IntrinsicMethod extends Callable {
StackValue generate(
ExpressionCodegen codegen, InstructionAdapter v, @NotNull Type returnType, @Nullable PsiElement element,
@Nullable List<JetExpression> arguments, @Nullable StackValue receiver, @NotNull GenerationState state
public abstract class IntrinsicMethod implements Callable {
public final void generate(
@NotNull ExpressionCodegen codegen,
@NotNull InstructionAdapter v,
@NotNull Type returnType,
@Nullable PsiElement element,
@Nullable List<JetExpression> arguments,
@Nullable StackValue receiver
) {
Type actualType = generateImpl(codegen, v, returnType, element, arguments, receiver);
StackValue.coerce(actualType, returnType, v);
}
@NotNull
protected abstract Type generateImpl(
ExpressionCodegen codegen,
InstructionAdapter v,
@NotNull Type returnType,
@Nullable PsiElement element,
@Nullable List<JetExpression> arguments,
@Nullable StackValue receiver
);
}
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Inv.java
+7 -9
View File
@@ -22,27 +22,25 @@ import org.jetbrains.asm4.Type;
import org.jetbrains.asm4.commons.InstructionAdapter;
import org.jetbrains.jet.codegen.ExpressionCodegen;
import org.jetbrains.jet.codegen.StackValue;
import org.jetbrains.jet.codegen.state.GenerationState;
import org.jetbrains.jet.lang.psi.JetExpression;
import java.util.List;
import static org.jetbrains.jet.codegen.AsmUtil.isPrimitive;
import static org.jetbrains.jet.codegen.AsmUtil.numberFunctionOperandType;
import static org.jetbrains.jet.codegen.AsmUtil.unboxType;
public class Inv implements IntrinsicMethod {
public class Inv extends IntrinsicMethod {
@NotNull
@Override
public StackValue generate(
public Type generateImpl(
ExpressionCodegen codegen,
InstructionAdapter v,
@NotNull Type returnType,
PsiElement element,
List<JetExpression> arguments,
StackValue receiver,
@NotNull GenerationState state
StackValue receiver
) {
boolean nullable = returnType.getSort() == Type.OBJECT;
assert !nullable : "Return type of Inv intrinsic should be of primitive type : " + returnType;
assert isPrimitive(returnType) : "Return type of Inv intrinsic should be of primitive type : " + returnType;
receiver.put(numberFunctionOperandType(returnType), v);
if (returnType == Type.LONG_TYPE) {
@@ -52,6 +50,6 @@ public class Inv implements IntrinsicMethod {
v.iconst(-1);
}
v.xor(returnType);
return StackValue.onStack(returnType);
return returnType;
}
}
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IteratorIterator.java
+5 -6
View File
@@ -23,23 +23,22 @@ import org.jetbrains.asm4.Type;
import org.jetbrains.asm4.commons.InstructionAdapter;
import org.jetbrains.jet.codegen.ExpressionCodegen;
import org.jetbrains.jet.codegen.StackValue;
import org.jetbrains.jet.codegen.state.GenerationState;
import org.jetbrains.jet.lang.psi.JetExpression;
import java.util.List;
public class IteratorIterator implements IntrinsicMethod {
public class IteratorIterator extends IntrinsicMethod {
@NotNull
@Override
public StackValue generate(
public Type generateImpl(
ExpressionCodegen codegen,
InstructionAdapter v,
@NotNull Type returnType,
@Nullable PsiElement element,
@Nullable List<JetExpression> arguments,
StackValue receiver,
@NotNull GenerationState state
StackValue receiver
) {
receiver.put(returnType, v);
return StackValue.onStack(returnType);
return returnType;
}
}
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IteratorNext.java
+6 -7
View File
@@ -20,24 +20,23 @@ import com.intellij.psi.PsiElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.asm4.Type;
import org.jetbrains.asm4.commons.InstructionAdapter;
import org.jetbrains.jet.lang.resolve.java.AsmTypeConstants;
import org.jetbrains.jet.codegen.ExpressionCodegen;
import org.jetbrains.jet.codegen.StackValue;
import org.jetbrains.jet.codegen.state.GenerationState;
import org.jetbrains.jet.lang.psi.JetExpression;
import org.jetbrains.jet.lang.resolve.java.AsmTypeConstants;
import java.util.List;
public class IteratorNext implements IntrinsicMethod {
public class IteratorNext extends IntrinsicMethod {
@NotNull
@Override
public StackValue generate(
public Type generateImpl(
ExpressionCodegen codegen,
InstructionAdapter v,
@NotNull Type returnType,
PsiElement element,
List<JetExpression> arguments,
StackValue receiver,
@NotNull GenerationState state
StackValue receiver
) {
String name;
if (returnType == Type.CHAR_TYPE) {
@@ -69,6 +68,6 @@ public class IteratorNext implements IntrinsicMethod {
}
receiver.put(AsmTypeConstants.OBJECT_TYPE, v);
v.invokevirtual("jet/" + name + "Iterator", "next" + name, "()" + returnType.getDescriptor());
return StackValue.onStack(returnType);
return returnType;
}
}
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/JavaClassArray.java
+5 -6
View File
@@ -23,7 +23,6 @@ import org.jetbrains.asm4.Type;
import org.jetbrains.asm4.commons.InstructionAdapter;
import org.jetbrains.jet.codegen.ExpressionCodegen;
import org.jetbrains.jet.codegen.StackValue;
import org.jetbrains.jet.codegen.state.GenerationState;
import org.jetbrains.jet.lang.descriptors.CallableDescriptor;
import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
import org.jetbrains.jet.lang.psi.JetCallExpression;
@@ -36,22 +35,22 @@ import org.jetbrains.jet.lang.resolve.calls.model.VarargValueArgument;
import java.util.List;
import java.util.Map;
public class JavaClassArray implements IntrinsicMethod {
public class JavaClassArray extends IntrinsicMethod {
@NotNull
@Override
public StackValue generate(
public Type generateImpl(
ExpressionCodegen codegen,
InstructionAdapter v,
@NotNull Type returnType,
@Nullable PsiElement element,
@Nullable List<JetExpression> arguments,
StackValue receiver,
@NotNull GenerationState state
StackValue receiver
) {
ResolvedCall<? extends CallableDescriptor> call =
codegen.getBindingContext().get(BindingContext.RESOLVED_CALL, ((JetCallExpression) element).getCalleeExpression());
assert call != null;
Map.Entry<ValueParameterDescriptor, ResolvedValueArgument> next = call.getValueArguments().entrySet().iterator().next();
codegen.genVarargs(next.getKey(), (VarargValueArgument) next.getValue());
return StackValue.onStack(returnType);
return returnType;
}
}
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/JavaClassFunction.java
+7 -9
View File
@@ -23,7 +23,6 @@ import org.jetbrains.asm4.Type;
import org.jetbrains.asm4.commons.InstructionAdapter;
import org.jetbrains.jet.codegen.ExpressionCodegen;
import org.jetbrains.jet.codegen.StackValue;
import org.jetbrains.jet.codegen.state.GenerationState;
import org.jetbrains.jet.lang.descriptors.CallableDescriptor;
import org.jetbrains.jet.lang.psi.JetCallExpression;
import org.jetbrains.jet.lang.psi.JetExpression;
@@ -37,20 +36,20 @@ import static org.jetbrains.jet.codegen.AsmUtil.boxType;
import static org.jetbrains.jet.codegen.AsmUtil.isPrimitive;
import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.getType;
public class JavaClassFunction implements IntrinsicMethod {
public class JavaClassFunction extends IntrinsicMethod {
@NotNull
@Override
public StackValue generate(
public Type generateImpl(
ExpressionCodegen codegen, InstructionAdapter v, @NotNull Type expectedType, @Nullable PsiElement element,
@Nullable List<JetExpression> arguments, StackValue receiver, @NotNull GenerationState state
@Nullable List<JetExpression> arguments, StackValue receiver
) {
JetCallExpression call = (JetCallExpression) element;
ResolvedCall<? extends CallableDescriptor> resolvedCall =
codegen.getBindingContext().get(BindingContext.RESOLVED_CALL, call.getCalleeExpression());
assert resolvedCall != null;
CallableDescriptor resultingDescriptor = resolvedCall.getResultingDescriptor();
JetType returnType = resultingDescriptor.getReturnType();
JetType returnType = resolvedCall.getResultingDescriptor().getReturnType();
assert returnType != null;
Type type = state.getTypeMapper().mapType(returnType.getArguments().get(0).getType());
Type type = codegen.getState().getTypeMapper().mapType(returnType.getArguments().get(0).getType());
if (isPrimitive(type)) {
v.getstatic(boxType(type).getInternalName(), "TYPE", "Ljava/lang/Class;");
}
@@ -58,7 +57,6 @@ public class JavaClassFunction implements IntrinsicMethod {
v.aconst(type);
}
StackValue.coerce(getType(Class.class), expectedType, v);
return StackValue.onStack(expectedType);
return getType(Class.class);
}
}
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/JavaClassProperty.java
+5 -7
View File
@@ -23,7 +23,6 @@ import org.jetbrains.asm4.Type;
import org.jetbrains.asm4.commons.InstructionAdapter;
import org.jetbrains.jet.codegen.ExpressionCodegen;
import org.jetbrains.jet.codegen.StackValue;
import org.jetbrains.jet.codegen.state.GenerationState;
import org.jetbrains.jet.lang.psi.JetExpression;
import java.util.List;
@@ -32,16 +31,16 @@ import static org.jetbrains.jet.codegen.AsmUtil.boxType;
import static org.jetbrains.jet.codegen.AsmUtil.isPrimitive;
import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.getType;
public class JavaClassProperty implements IntrinsicMethod {
public class JavaClassProperty extends IntrinsicMethod {
@NotNull
@Override
public StackValue generate(
public Type generateImpl(
ExpressionCodegen codegen,
InstructionAdapter v,
@NotNull Type returnType,
@Nullable PsiElement element,
@Nullable List<JetExpression> arguments,
StackValue receiver,
@NotNull GenerationState state
StackValue receiver
) {
Type type = receiver.type;
if (isPrimitive(type)) {
@@ -52,7 +51,6 @@ public class JavaClassProperty implements IntrinsicMethod {
v.invokevirtual("java/lang/Object", "getClass", "()Ljava/lang/Class;");
}
StackValue.coerce(getType(Class.class), returnType, v);
return StackValue.onStack(returnType);
return getType(Class.class);
}
}
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/NewArray.java
+5 -6
View File
@@ -22,24 +22,23 @@ import org.jetbrains.asm4.Type;
import org.jetbrains.asm4.commons.InstructionAdapter;
import org.jetbrains.jet.codegen.ExpressionCodegen;
import org.jetbrains.jet.codegen.StackValue;
import org.jetbrains.jet.codegen.state.GenerationState;
import org.jetbrains.jet.lang.psi.JetCallExpression;
import org.jetbrains.jet.lang.psi.JetExpression;
import java.util.List;
public class NewArray implements IntrinsicMethod {
public class NewArray extends IntrinsicMethod {
@NotNull
@Override
public StackValue generate(
public Type generateImpl(
ExpressionCodegen codegen,
InstructionAdapter v,
@NotNull Type returnType,
PsiElement element,
List<JetExpression> arguments,
StackValue receiver,
@NotNull GenerationState state
StackValue receiver
) {
codegen.generateNewArray((JetCallExpression) element);
return StackValue.onStack(returnType);
return returnType;
}
}
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Not.java
+5 -6
View File
@@ -22,21 +22,20 @@ import org.jetbrains.asm4.Type;
import org.jetbrains.asm4.commons.InstructionAdapter;
import org.jetbrains.jet.codegen.ExpressionCodegen;
import org.jetbrains.jet.codegen.StackValue;
import org.jetbrains.jet.codegen.state.GenerationState;
import org.jetbrains.jet.lang.psi.JetExpression;
import java.util.List;
public class Not implements IntrinsicMethod {
public class Not extends IntrinsicMethod {
@NotNull
@Override
public StackValue generate(
public Type generateImpl(
ExpressionCodegen codegen,
InstructionAdapter v,
@NotNull Type returnType,
PsiElement element,
List<JetExpression> arguments,
StackValue receiver,
@NotNull GenerationState state
StackValue receiver
) {
StackValue stackValue;
if (arguments.size() == 1) {
@@ -47,6 +46,6 @@ public class Not implements IntrinsicMethod {
}
stackValue.put(Type.BOOLEAN_TYPE, v);
StackValue.not(StackValue.onStack(Type.BOOLEAN_TYPE)).put(returnType, v);
return StackValue.onStack(returnType);
return returnType;
}
}
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/NumberCast.java
+5 -6
View File
@@ -22,23 +22,22 @@ import org.jetbrains.asm4.Type;
import org.jetbrains.asm4.commons.InstructionAdapter;
import org.jetbrains.jet.codegen.ExpressionCodegen;
import org.jetbrains.jet.codegen.StackValue;
import org.jetbrains.jet.codegen.state.GenerationState;
import org.jetbrains.jet.lang.psi.JetExpression;
import java.util.List;
public class NumberCast implements IntrinsicMethod {
public class NumberCast extends IntrinsicMethod {
@NotNull
@Override
public StackValue generate(
public Type generateImpl(
ExpressionCodegen codegen,
InstructionAdapter v,
@NotNull Type returnType,
PsiElement element,
List<JetExpression> arguments,
StackValue receiver,
@NotNull GenerationState state
StackValue receiver
) {
receiver.put(returnType, v);
return StackValue.onStack(returnType);
return returnType;
}
}
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/PropertyOfProgressionOrRange.java
+6 -8
View File
@@ -23,7 +23,6 @@ import org.jetbrains.asm4.commons.InstructionAdapter;
import org.jetbrains.jet.codegen.ExpressionCodegen;
import org.jetbrains.jet.codegen.PropertyCodegen;
import org.jetbrains.jet.codegen.StackValue;
import org.jetbrains.jet.codegen.state.GenerationState;
import org.jetbrains.jet.lang.psi.JetExpression;
import org.jetbrains.jet.lang.resolve.java.JvmClassName;
import org.jetbrains.jet.lang.resolve.name.FqName;
@@ -33,7 +32,7 @@ import java.util.List;
import static org.jetbrains.jet.codegen.AsmUtil.boxType;
public class PropertyOfProgressionOrRange implements IntrinsicMethod {
public class PropertyOfProgressionOrRange extends IntrinsicMethod {
private final FqName ownerClass;
private final Name propertyName;
@@ -42,23 +41,22 @@ public class PropertyOfProgressionOrRange implements IntrinsicMethod {
this.propertyName = propertyName;
}
@NotNull
@Override
public StackValue generate(
public Type generateImpl(
ExpressionCodegen codegen,
InstructionAdapter v,
@NotNull Type returnType,
PsiElement element,
List<JetExpression> arguments,
StackValue receiver,
@NotNull GenerationState state
StackValue receiver
) {
String ownerInternalName = JvmClassName.byFqNameWithoutInnerClasses(this.ownerClass).getInternalName();
String ownerInternalName = JvmClassName.byFqNameWithoutInnerClasses(ownerClass).getInternalName();
Type boxedType = boxType(returnType);
String getterName = PropertyCodegen.getterName(propertyName);
receiver.put(receiver.type, v);
v.invokevirtual(ownerInternalName, getterName, "()" + boxedType.getDescriptor());
StackValue.coerce(boxedType, returnType, v);
return StackValue.onStack(returnType);
return boxedType;
}
}
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/RangeTo.java
+5 -7
View File
@@ -22,22 +22,21 @@ import org.jetbrains.asm4.Type;
import org.jetbrains.asm4.commons.InstructionAdapter;
import org.jetbrains.jet.codegen.ExpressionCodegen;
import org.jetbrains.jet.codegen.StackValue;
import org.jetbrains.jet.codegen.state.GenerationState;
import org.jetbrains.jet.lang.psi.JetBinaryExpression;
import org.jetbrains.jet.lang.psi.JetExpression;
import java.util.List;
public class RangeTo implements IntrinsicMethod {
public class RangeTo extends IntrinsicMethod {
@NotNull
@Override
public StackValue generate(
public Type generateImpl(
ExpressionCodegen codegen,
InstructionAdapter v,
@NotNull Type returnType,
PsiElement element,
List<JetExpression> arguments,
StackValue receiver,
@NotNull GenerationState state
StackValue receiver
) {
if (arguments.size() == 1) {
Type leftType = receiver.type;
@@ -56,7 +55,6 @@ public class RangeTo implements IntrinsicMethod {
v.invokestatic("jet/runtime/Ranges", "rangeTo",
"(" + leftType.getDescriptor() + rightType.getDescriptor() + ")" + returnType.getDescriptor());
}
return StackValue.onStack(returnType);
return returnType;
}
}
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/StaticField.java
+5 -7
View File
@@ -23,7 +23,6 @@ import org.jetbrains.asm4.Type;
import org.jetbrains.asm4.commons.InstructionAdapter;
import org.jetbrains.jet.codegen.ExpressionCodegen;
import org.jetbrains.jet.codegen.StackValue;
import org.jetbrains.jet.codegen.state.GenerationState;
import org.jetbrains.jet.lang.psi.JetExpression;
import org.jetbrains.jet.lang.resolve.java.JvmClassName;
import org.jetbrains.jet.lang.resolve.name.FqName;
@@ -31,27 +30,26 @@ import org.jetbrains.jet.lang.resolve.name.Name;
import java.util.List;
public class StaticField implements IntrinsicMethod {
public class StaticField extends IntrinsicMethod {
private final FqName ownerClass;
private final Name propertyName;
public StaticField(FqName ownerClass, Name propertyName) {
this.ownerClass = ownerClass;
this.propertyName = propertyName;
}
@NotNull
@Override
public StackValue generate(
public Type generateImpl(
ExpressionCodegen codegen,
InstructionAdapter v,
@NotNull Type returnType,
@Nullable PsiElement element,
@Nullable List<JetExpression> arguments,
StackValue receiver,
@NotNull GenerationState state
StackValue receiver
) {
v.getstatic(JvmClassName.byFqNameWithoutInnerClasses(ownerClass).getInternalName(), propertyName.asString(), returnType.getDescriptor());
return StackValue.onStack(returnType);
return returnType;
}
}
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/StringGetChar.java
+5 -8
View File
@@ -20,24 +20,22 @@ import com.intellij.psi.PsiElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.asm4.Type;
import org.jetbrains.asm4.commons.InstructionAdapter;
import org.jetbrains.jet.lang.resolve.java.AsmTypeConstants;
import org.jetbrains.jet.codegen.ExpressionCodegen;
import org.jetbrains.jet.codegen.StackValue;
import org.jetbrains.jet.codegen.state.GenerationState;
import org.jetbrains.jet.lang.psi.JetExpression;
import java.util.List;
public class StringGetChar implements IntrinsicMethod {
public class StringGetChar extends IntrinsicMethod {
@NotNull
@Override
public StackValue generate(
public Type generateImpl(
ExpressionCodegen codegen,
InstructionAdapter v,
@NotNull Type returnType,
PsiElement element,
List<JetExpression> arguments,
StackValue receiver,
@NotNull GenerationState state
StackValue receiver
) {
if (receiver != null) {
receiver.put(receiver.type, v);
@@ -46,7 +44,6 @@ public class StringGetChar implements IntrinsicMethod {
codegen.gen(arguments.get(0)).put(Type.INT_TYPE, v);
}
v.invokeinterface("java/lang/CharSequence", "charAt", "(I)C");
StackValue.coerce(Type.CHAR_TYPE, returnType, v);
return StackValue.onStack(returnType);
return Type.CHAR_TYPE;
}
}
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/StringLength.java
+5 -8
View File
@@ -20,28 +20,25 @@ import com.intellij.psi.PsiElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.asm4.Type;
import org.jetbrains.asm4.commons.InstructionAdapter;
import org.jetbrains.jet.lang.resolve.java.AsmTypeConstants;
import org.jetbrains.jet.codegen.ExpressionCodegen;
import org.jetbrains.jet.codegen.StackValue;
import org.jetbrains.jet.codegen.state.GenerationState;
import org.jetbrains.jet.lang.psi.JetExpression;
import java.util.List;
public class StringLength implements IntrinsicMethod {
public class StringLength extends IntrinsicMethod {
@NotNull
@Override
public StackValue generate(
public Type generateImpl(
ExpressionCodegen codegen,
InstructionAdapter v,
@NotNull Type returnType,
PsiElement element,
List<JetExpression> arguments,
StackValue receiver,
@NotNull GenerationState state
StackValue receiver
) {
receiver.put(receiver.type, v);
v.invokeinterface("java/lang/CharSequence", "length", "()I");
StackValue.coerce(Type.INT_TYPE, returnType, v);
return StackValue.onStack(returnType);
return Type.INT_TYPE;
}
}
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/StringPlus.java
+5 -8
View File
@@ -22,7 +22,6 @@ import org.jetbrains.asm4.Type;
import org.jetbrains.asm4.commons.InstructionAdapter;
import org.jetbrains.jet.codegen.ExpressionCodegen;
import org.jetbrains.jet.codegen.StackValue;
import org.jetbrains.jet.codegen.state.GenerationState;
import org.jetbrains.jet.lang.psi.JetExpression;
import java.util.List;
@@ -30,16 +29,16 @@ import java.util.List;
import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.JAVA_STRING_TYPE;
import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.OBJECT_TYPE;
public class StringPlus implements IntrinsicMethod {
public class StringPlus extends IntrinsicMethod {
@NotNull
@Override
public StackValue generate(
public Type generateImpl(
ExpressionCodegen codegen,
InstructionAdapter v,
@NotNull Type returnType,
PsiElement element,
List<JetExpression> arguments,
StackValue receiver,
@NotNull GenerationState state
StackValue receiver
) {
if (receiver == null || receiver == StackValue.none()) {
codegen.gen(arguments.get(0)).put(JAVA_STRING_TYPE, v);
@@ -50,8 +49,6 @@ public class StringPlus implements IntrinsicMethod {
codegen.gen(arguments.get(0)).put(OBJECT_TYPE, v);
}
v.invokestatic("jet/runtime/Intrinsics", "stringPlus", "(Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/String;");
StackValue.coerce(JAVA_STRING_TYPE, returnType, v);
return StackValue.onStack(returnType);
return JAVA_STRING_TYPE;
}
}
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/StupidSync.java
+9 -9
View File
@@ -21,30 +21,30 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.asm4.Type;
import org.jetbrains.asm4.commons.InstructionAdapter;
import org.jetbrains.jet.lang.resolve.java.AsmTypeConstants;
import org.jetbrains.jet.codegen.ExpressionCodegen;
import org.jetbrains.jet.codegen.StackValue;
import org.jetbrains.jet.codegen.state.GenerationState;
import org.jetbrains.jet.lang.psi.JetCallExpression;
import org.jetbrains.jet.lang.psi.JetExpression;
import java.util.Arrays;
import java.util.List;
public class StupidSync implements IntrinsicMethod {
import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.JET_FUNCTION0_TYPE;
import static org.jetbrains.jet.lang.resolve.java.AsmTypeConstants.OBJECT_TYPE;
public class StupidSync extends IntrinsicMethod {
@NotNull
@Override
public StackValue generate(
public Type generateImpl(
ExpressionCodegen codegen,
InstructionAdapter v,
@NotNull Type returnType,
@Nullable PsiElement element,
@Nullable List<JetExpression> arguments,
StackValue receiver,
@NotNull GenerationState state
StackValue receiver
) {
codegen.pushMethodArguments((JetCallExpression) element, Arrays.asList(AsmTypeConstants.OBJECT_TYPE, AsmTypeConstants.JET_FUNCTION0_TYPE));
codegen.pushMethodArguments((JetCallExpression) element, Arrays.asList(OBJECT_TYPE, JET_FUNCTION0_TYPE));
v.invokestatic("jet/runtime/Intrinsics", "stupidSync", "(Ljava/lang/Object;Ljet/Function0;)Ljava/lang/Object;");
StackValue.onStack(AsmTypeConstants.OBJECT_TYPE).put(returnType, v);
return StackValue.onStack(returnType);
return OBJECT_TYPE;
}
}
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/ToString.java
+5 -6
View File
@@ -22,25 +22,24 @@ import org.jetbrains.asm4.Type;
import org.jetbrains.asm4.commons.InstructionAdapter;
import org.jetbrains.jet.codegen.ExpressionCodegen;
import org.jetbrains.jet.codegen.StackValue;
import org.jetbrains.jet.codegen.state.GenerationState;
import org.jetbrains.jet.lang.psi.JetExpression;
import java.util.List;
import static org.jetbrains.jet.codegen.AsmUtil.genToString;
public class ToString implements IntrinsicMethod {
public class ToString extends IntrinsicMethod {
@NotNull
@Override
public StackValue generate(
public Type generateImpl(
ExpressionCodegen codegen,
InstructionAdapter v,
@NotNull Type returnType,
PsiElement element,
List<JetExpression> arguments,
StackValue receiver,
@NotNull GenerationState state
StackValue receiver
) {
genToString(v, receiver, receiver.type).put(returnType, v);
return StackValue.onStack(returnType);
return returnType;
}
}
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/UnaryMinus.java
+7 -13
View File
@@ -22,28 +22,24 @@ import org.jetbrains.asm4.Type;
import org.jetbrains.asm4.commons.InstructionAdapter;
import org.jetbrains.jet.codegen.ExpressionCodegen;
import org.jetbrains.jet.codegen.StackValue;
import org.jetbrains.jet.codegen.state.GenerationState;
import org.jetbrains.jet.lang.psi.JetExpression;
import java.util.List;
import static org.jetbrains.jet.codegen.AsmUtil.genNegate;
import static org.jetbrains.jet.codegen.AsmUtil.numberFunctionOperandType;
import static org.jetbrains.jet.codegen.AsmUtil.unboxType;
import static org.jetbrains.jet.codegen.AsmUtil.*;
public class UnaryMinus implements IntrinsicMethod {
public class UnaryMinus extends IntrinsicMethod {
@NotNull
@Override
public StackValue generate(
public Type generateImpl(
ExpressionCodegen codegen,
InstructionAdapter v,
@NotNull Type returnType,
PsiElement element,
List<JetExpression> arguments,
StackValue receiver,
@NotNull GenerationState state
StackValue receiver
) {
boolean nullable = returnType.getSort() == Type.OBJECT;
assert !nullable : "Return type of UnaryMinus intrinsic should be of primitive type : " + returnType;
assert isPrimitive(returnType) : "Return type of UnaryMinus intrinsic should be of primitive type: " + returnType;
Type operandType = numberFunctionOperandType(returnType);
@@ -53,8 +49,6 @@ public class UnaryMinus implements IntrinsicMethod {
else {
receiver.put(operandType, v);
}
Type negatedValue = genNegate(returnType, v);
StackValue.coerce(negatedValue, returnType, v);
return StackValue.onStack(returnType);
return genNegate(returnType, v);
}
}
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/UnaryPlus.java
+7 -9
View File
@@ -23,26 +23,24 @@ import org.jetbrains.asm4.Type;
import org.jetbrains.asm4.commons.InstructionAdapter;
import org.jetbrains.jet.codegen.ExpressionCodegen;
import org.jetbrains.jet.codegen.StackValue;
import org.jetbrains.jet.codegen.state.GenerationState;
import org.jetbrains.jet.lang.psi.JetExpression;
import java.util.List;
import static org.jetbrains.jet.codegen.AsmUtil.unboxType;
import static org.jetbrains.jet.codegen.AsmUtil.isPrimitive;
public class UnaryPlus implements IntrinsicMethod {
public class UnaryPlus extends IntrinsicMethod {
@NotNull
@Override
public StackValue generate(
public Type generateImpl(
ExpressionCodegen codegen,
InstructionAdapter v,
@NotNull Type returnType,
@Nullable PsiElement element,
@Nullable List<JetExpression> arguments,
StackValue receiver,
@NotNull GenerationState state
StackValue receiver
) {
boolean nullable = returnType.getSort() == Type.OBJECT;
assert !nullable : "Return type of UnaryPlus intrinsic should be of primitive type : " + returnType;
assert isPrimitive(returnType) : "Return type of UnaryPlus intrinsic should be of primitive type : " + returnType;
if (receiver != null && receiver != StackValue.none()) {
receiver.put(returnType, v);
@@ -51,6 +49,6 @@ public class UnaryPlus implements IntrinsicMethod {
assert arguments != null;
codegen.gen(arguments.get(0), returnType);
}
return StackValue.onStack(returnType);
return returnType;
}
}
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AsmTypeConstants.java
-1
View File
@@ -33,7 +33,6 @@ public class AsmTypeConstants {
public static final Type JET_UNIT_TYPE = Type.getObjectType("jet/Unit");
public static final Type JET_FUNCTION0_TYPE = Type.getObjectType("jet/Function0");
public static final Type JET_FUNCTION1_TYPE = Type.getObjectType("jet/Function1");
public static final Type JET_ITERATOR_TYPE = Type.getObjectType("jet/Iterator");
public static final Type JET_INT_RANGE_TYPE = Type.getObjectType("jet/IntRange");
public static final Type JET_SHARED_VAR_TYPE = Type.getObjectType("jet/runtime/SharedVar$Object");
public static final Type JET_SHARED_INT_TYPE = Type.getObjectType("jet/runtime/SharedVar$Int");