Substitute CALLABLE_REFERENCE slice with FUNCTION one

compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java

@@ -2426,7 +2426,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> 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<? extends CallableDescriptor> resolvedCall = bindingContext.get(RESOLVED_CALL, expression.getCallableReference());

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;
 

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;