From 0486e6cf4c1e9efc6c5ae2ea227506f9d3d336c1 Mon Sep 17 00:00:00 2001 From: Mikhael Bogdanov Date: Wed, 18 Sep 2013 15:42:10 +0400 Subject: [PATCH] Substitute CALLABLE_REFERENCE slice with FUNCTION one --- .../src/org/jetbrains/jet/codegen/ExpressionCodegen.java | 2 +- .../jetbrains/jet/codegen/binding/CodegenAnnotatingVisitor.java | 2 +- .../lang/types/expressions/BasicExpressionTypingVisitor.java | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java index 776ef846f0c..0c958145943 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java @@ -2426,7 +2426,7 @@ public class ExpressionCodegen extends JetVisitor implem @Override public StackValue visitCallableReferenceExpression(JetCallableReferenceExpression expression, StackValue data) { // TODO: properties - final FunctionDescriptor functionDescriptor = bindingContext.get(CALLABLE_REFERENCE, expression); + final FunctionDescriptor functionDescriptor = bindingContext.get(FUNCTION, expression); assert functionDescriptor != null : "Callable reference is not resolved to descriptor: " + expression.getText(); final ResolvedCall resolvedCall = bindingContext.get(RESOLVED_CALL, expression.getCallableReference()); diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenAnnotatingVisitor.java b/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenAnnotatingVisitor.java index d04c03c59be..a460cacf663 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenAnnotatingVisitor.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenAnnotatingVisitor.java @@ -260,7 +260,7 @@ class CodegenAnnotatingVisitor extends JetVisitorVoid { @Override public void visitCallableReferenceExpression(JetCallableReferenceExpression expression) { - FunctionDescriptor functionDescriptor = bindingContext.get(CALLABLE_REFERENCE, expression); + FunctionDescriptor functionDescriptor = bindingContext.get(FUNCTION, expression); // working around a problem with shallow analysis if (functionDescriptor == null) return; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java index f2b794b0970..d47adce15a7 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java @@ -515,7 +515,6 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { FunctionDescriptorUtil.initializeFromFunctionType(functionDescriptor, type, null, Modality.FINAL, Visibilities.PUBLIC); - context.trace.record(CALLABLE_REFERENCE, expression, functionDescriptor); context.trace.record(FUNCTION, expression, functionDescriptor); return type;