Distinguish Call::CallType::PROPERTY_CALL further.

src/full-codegen/ia32/full-codegen-ia32.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #if V8_TARGET_ARCH_IA32
 
 #include "src/code-factory.h"
 #include "src/code-stubs.h"
 #include "src/codegen.h"
 #include "src/debug/debug.h"
@@ skipping 2921 matching lines @@
 #ifdef DEBUG
   // We want to verify that RecordJSReturnSite gets called on all paths
   // through this function.  Avoid early returns.
   expr->return_is_recorded_ = false;
 #endif
 
   Comment cmnt(masm_, "[ Call");
   Expression* callee = expr->expression();
   Call::CallType call_type = expr->GetCallType(isolate());
 
   if (call_type == Call::POSSIBLY_EVAL_CALL) {

[rossberg, 2015/10/29 13:14:30]

Perhaps this should be turned into a switch now. (But then you have to port that
to all platforms :-P)

[Michael Starzinger, 2015/10/29 13:20:49]

Would you accept an "in a follow-up CL" voucher for that? ;)

[rossberg, 2015/10/29 13:22:21]

Certainly. :)

     // In a call to eval, we first call RuntimeHidden_ResolvePossiblyDirectEval
     // to resolve the function we need to call.  Then we call the resolved
     // function using the given arguments.
     ZoneList<Expression*>* args = expr->arguments();
     int arg_count = args->length();
 
     PushCalleeAndWithBaseObject(expr);
 
     // Push the arguments.
     for (int i = 0; i < arg_count; i++) {
@@ skipping 18 matching lines @@
     // Restore context register.
     __ mov(esi, Operand(ebp, StandardFrameConstants::kContextOffset));
     context()->DropAndPlug(1, eax);
 
   } else if (call_type == Call::GLOBAL_CALL) {
     EmitCallWithLoadIC(expr);
   } else if (call_type == Call::LOOKUP_SLOT_CALL) {
     // Call to a lookup slot (dynamically introduced variable).
     PushCalleeAndWithBaseObject(expr);
     EmitCall(expr);
-  } else if (call_type == Call::PROPERTY_CALL) {
+  } else if (call_type == Call::NAMED_PROPERTY_CALL) {
     Property* property = callee->AsProperty();
-    bool is_named_call = property->key()->IsPropertyName();
-    if (property->IsSuperAccess()) {
-      if (is_named_call) {
-        EmitSuperCallWithLoadIC(expr);
-      } else {
-        EmitKeyedSuperCallWithLoadIC(expr);
-      }
-    } else {
-      VisitForStackValue(property->obj());
-      if (is_named_call) {
-        EmitCallWithLoadIC(expr);
-      } else {
-        EmitKeyedCallWithLoadIC(expr, property->key());
-      }
-    }
+    VisitForStackValue(property->obj());
+    EmitCallWithLoadIC(expr);
+  } else if (call_type == Call::KEYED_PROPERTY_CALL) {
+    Property* property = callee->AsProperty();
+    VisitForStackValue(property->obj());
+    EmitKeyedCallWithLoadIC(expr, property->key());
+  } else if (call_type == Call::NAMED_SUPER_PROPERTY_CALL) {
+    EmitSuperCallWithLoadIC(expr);
+  } else if (call_type == Call::KEYED_SUPER_PROPERTY_CALL) {
+    EmitKeyedSuperCallWithLoadIC(expr);
   } else if (call_type == Call::SUPER_CALL) {
     EmitSuperConstructorCall(expr);
   } else {
     DCHECK(call_type == Call::OTHER_CALL);
     // Call to an arbitrary expression not handled specially above.
     VisitForStackValue(callee);
     __ push(Immediate(isolate()->factory()->undefined_value()));
     // Emit function call.
     EmitCall(expr);
   }
@@ skipping 2053 matching lines @@
             Assembler::target_address_at(call_target_address,
                                          unoptimized_code));
   return OSR_AFTER_STACK_CHECK;
 }
 
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_IA32