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

Minor, get rid of ExpressionCodegen.asmTypeOrVoid()

Browse Source
This commit is contained in:
Alexander Udalov
2014-05-05 17:21:45 +04:00
parent 51b01b5d7d
commit fc3db8db38
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+4 -9
View File
@@ -317,7 +317,8 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
} }
@NotNull @NotNull
private Type asmTypeOrVoid(@Nullable JetType type) { public Type expressionType(JetExpression expression) {
JetType type = bindingContext.get(EXPRESSION_TYPE, expression);
return type == null ? Type.VOID_TYPE : asmType(type); return type == null ? Type.VOID_TYPE : asmType(type);
} }
@@ -2406,11 +2407,6 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
} }
} }
@NotNull
public Type expressionType(JetExpression expr) {
return asmTypeOrVoid(bindingContext.get(EXPRESSION_TYPE, expr));
}
public int indexOfLocal(JetReferenceExpression lhs) { public int indexOfLocal(JetReferenceExpression lhs) {
DeclarationDescriptor declarationDescriptor = bindingContext.get(BindingContext.REFERENCE_TARGET, lhs); DeclarationDescriptor declarationDescriptor = bindingContext.get(BindingContext.REFERENCE_TARGET, lhs);
if (isVarCapturedInClosure(bindingContext, declarationDescriptor)) { if (isVarCapturedInClosure(bindingContext, declarationDescriptor)) {
@@ -3301,7 +3297,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
public StackValue visitArrayAccessExpression(@NotNull JetArrayAccessExpression expression, StackValue receiver) { public StackValue visitArrayAccessExpression(@NotNull JetArrayAccessExpression expression, StackValue receiver) {
JetExpression array = expression.getArrayExpression(); JetExpression array = expression.getArrayExpression();
JetType type = bindingContext.get(BindingContext.EXPRESSION_TYPE, array); JetType type = bindingContext.get(BindingContext.EXPRESSION_TYPE, array);
Type arrayType = asmTypeOrVoid(type); Type arrayType = expressionType(array);
List<JetExpression> indices = expression.getIndexExpressions(); List<JetExpression> indices = expression.getIndexExpressions();
FunctionDescriptor operationDescriptor = (FunctionDescriptor) bindingContext.get(BindingContext.REFERENCE_TARGET, expression); FunctionDescriptor operationDescriptor = (FunctionDescriptor) bindingContext.get(BindingContext.REFERENCE_TARGET, expression);
assert operationDescriptor != null; assert operationDescriptor != null;
@@ -3628,8 +3624,7 @@ The "returned" value of try expression with no finally is either the last expres
public StackValue generateWhenExpression(JetWhenExpression expression, boolean isStatement) { public StackValue generateWhenExpression(JetWhenExpression expression, boolean isStatement) {
JetExpression expr = expression.getSubjectExpression(); JetExpression expr = expression.getSubjectExpression();
JetType subjectJetType = bindingContext.get(BindingContext.EXPRESSION_TYPE, expr); Type subjectType = expressionType(expr);
Type subjectType = asmTypeOrVoid(subjectJetType);
Type resultType = isStatement ? Type.VOID_TYPE : expressionType(expression); Type resultType = isStatement ? Type.VOID_TYPE : expressionType(expression);