From 0ba38b9f09b34c7e5b8711735a4c9264096ba3c6 Mon Sep 17 00:00:00 2001
From: Mikhael Bogdanov <mikhael.bogdanov@jetbrains.com>
Date: Wed, 3 Apr 2013 15:35:49 +0400
Subject: [PATCH] Removed code duplication and unnecessary branch

---
 .../jetbrains/jet/codegen/ExpressionCodegen.java   | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
index 24e402341ca..50afdb3b619 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
@@ -1582,16 +1582,11 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
             else {
                 if (!isStatic) {
                     if (receiver == StackValue.none()) {
-                        if (resolvedCall == null) {
-                            receiver = generateThisOrOuter((ClassDescriptor) propertyDescriptor.getContainingDeclaration(), false);
+                        if (resolvedCall != null && resolvedCall.getThisObject() instanceof ExtensionReceiver) {
+                            receiver = generateReceiver(((ExtensionReceiver) resolvedCall.getThisObject()).getDeclarationDescriptor());
                         }
                         else {
-                            if (resolvedCall.getThisObject() instanceof ExtensionReceiver) {
-                                receiver = generateReceiver(((ExtensionReceiver) resolvedCall.getThisObject()).getDeclarationDescriptor());
-                            }
-                            else {
-                                receiver = generateThisOrOuter((ClassDescriptor) propertyDescriptor.getContainingDeclaration(), false);
-                            }
+                            receiver = generateThisOrOuter((ClassDescriptor) propertyDescriptor.getContainingDeclaration(), false);
                         }
                     }
                     if (directToField) {
@@ -2433,8 +2428,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
 
     @Override
     public StackValue visitDotQualifiedExpression(JetDotQualifiedExpression expression, StackValue receiver) {
-        JetExpression receiverExpression = expression.getReceiverExpression();
-        StackValue receiverValue = receiverExpression instanceof JetSuperExpression ? gen(receiverExpression) : StackValue.none();
+        StackValue receiverValue = StackValue.none();
         return genQualified(receiverValue, expression.getSelectorExpression());
     }