Make the strict-mode calling convention for contextual calls the default one.

src/ia32/code-stubs-ia32.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 2505 matching lines @@
   // edi : the function to call
   Isolate* isolate = masm->isolate();
   Label slow, non_function;
 
   // Check that the function really is a JavaScript function.
   __ JumpIfSmi(edi, &non_function);
 
   // The receiver might implicitly be the global object. This is
   // indicated by passing the hole as the receiver to the call
   // function stub.
-  if (ReceiverMightBeImplicit() || ReceiverIsImplicit()) {
-    Label try_call, call, patch_current_context;
+  Label call;
+  if (ReceiverMightBeImplicit()) {
+    Label try_call, patch_current_context;
     if (ReceiverMightBeImplicit()) {

[dcarney, 2014/01/13 18:35:03]

can remove conditional

       // Get the receiver from the stack.
       // +1 ~ return address
       __ mov(eax, Operand(esp, (argc_ + 1) * kPointerSize));
       // Call as function is indicated with the hole.
       __ cmp(eax, isolate->factory()->the_hole_value());

[dcarney, 2014/01/13 18:35:03]

can we just pass undefined in these cases and remove this entirely as well as
the ReceiverMightBeImplicit check below

       __ j(not_equal, &try_call, Label::kNear);
     }
-    // Patch the receiver on the stack with the global receiver object.
+
+    // Patch the global object on the stack.
+    __ mov(Operand(esp, (argc_ + 1) * kPointerSize),
+           isolate->factory()->undefined_value());
+
     // Goto slow case if we do not have a function.
-    __ CmpObjectType(edi, JS_FUNCTION_TYPE, ecx);
-    __ j(not_equal, &patch_current_context);
-    CallStubCompiler::FetchGlobalProxy(masm, ecx, edi);
-    __ mov(Operand(esp, (argc_ + 1) * kPointerSize), ecx);
-    __ jmp(&call, Label::kNear);
+    __ bind(&try_call);
+  }
 
-    __ bind(&patch_current_context);
-    __ mov(edx, isolate->factory()->undefined_value());
-    __ mov(Operand(esp, (argc_ + 1) * kPointerSize), edx);
-    __ jmp(&slow);
+  // Goto slow case if we do not have a function.
+  __ CmpObjectType(edi, JS_FUNCTION_TYPE, ecx);
+  __ j(not_equal, &slow);
 
-    __ bind(&try_call);
-    // Goto slow case if we do not have a function.
-    __ CmpObjectType(edi, JS_FUNCTION_TYPE, ecx);
-    __ j(not_equal, &slow);
-
-    __ bind(&call);
-  } else {
-    // Goto slow case if we do not have a function.
-    __ CmpObjectType(edi, JS_FUNCTION_TYPE, ecx);
-    __ j(not_equal, &slow);
-  }
+  __ bind(&call);
 
   if (RecordCallTarget()) {
     GenerateRecordCallTarget(masm);
   }
 
   // Fast-case: Just invoke the function.
   ParameterCount actual(argc_);
 
   if (ReceiverMightBeImplicit()) {
     Label call_as_function;
@@ skipping 35 matching lines @@
     Handle<Code> adaptor = isolate->builtins()->ArgumentsAdaptorTrampoline();
     __ jmp(adaptor, RelocInfo::CODE_TARGET);
   }
 
   // CALL_NON_FUNCTION expects the non-function callee as receiver (instead
   // of the original receiver from the call site).
   __ bind(&non_function);
   __ mov(Operand(esp, (argc_ + 1) * kPointerSize), edi);
   __ Set(eax, Immediate(argc_));
   __ Set(ebx, Immediate(0));
-  __ SetCallKind(ecx, CALL_AS_METHOD);
+  __ SetCallKind(ecx, CALL_AS_FUNCTION);
   __ GetBuiltinEntry(edx, Builtins::CALL_NON_FUNCTION);
   Handle<Code> adaptor = isolate->builtins()->ArgumentsAdaptorTrampoline();
   __ jmp(adaptor, RelocInfo::CODE_TARGET);
 }
 
 
 void CallConstructStub::Generate(MacroAssembler* masm) {
   // eax : number of arguments
   // ebx : cache cell for call target
   // edi : constructor function
@@ skipping 3096 matching lines @@
   __ bind(&fast_elements_case);
   GenerateCase(masm, FAST_ELEMENTS);
 }
 
 
 #undef __
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_IA32