Only to the relevant checks in LoadFunctionPrototype

BUG=
R=mvstanton@chromium.org

Review URL: https://codereview.chromium.org/412483003

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22550 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

src/arm/macro-assembler-arm.cc

@@ -2283,6 +2283,8 @@ void MacroAssembler::TryGetFunctionPrototype(Register function,
                                              Register scratch,
                                              Label* miss,
                                              bool miss_on_bound_function) {
+  Label non_instance;
+  if (miss_on_bound_function) {
     // Check that the receiver isn't a smi.
     JumpIfSmi(function, miss);
 
@@ -2290,7 +2292,6 @@ void MacroAssembler::TryGetFunctionPrototype(Register function,
     CompareObjectType(function, result, scratch, JS_FUNCTION_TYPE);
     b(ne, miss);
 
-  if (miss_on_bound_function) {
     ldr(scratch,
         FieldMemOperand(function, JSFunction::kSharedFunctionInfoOffset));
     ldr(scratch,
@@ -2298,13 +2299,12 @@ void MacroAssembler::TryGetFunctionPrototype(Register function,
     tst(scratch,
         Operand(Smi::FromInt(1 << SharedFunctionInfo::kBoundFunction)));
     b(ne, miss);
-  }
 
     // Make sure that the function has an instance prototype.
-  Label non_instance;
     ldrb(scratch, FieldMemOperand(result, Map::kBitFieldOffset));
     tst(scratch, Operand(1 << Map::kHasNonInstancePrototype));
     b(ne, &non_instance);
+  }
 
   // Get the prototype or initial map from the function.
   ldr(result,
@@ -2324,12 +2324,15 @@ void MacroAssembler::TryGetFunctionPrototype(Register function,
 
   // Get the prototype from the initial map.
   ldr(result, FieldMemOperand(result, Map::kPrototypeOffset));
+
+  if (miss_on_bound_function) {
     jmp(&done);
 
     // Non-instance prototype: Fetch prototype from constructor field
     // in initial map.
     bind(&non_instance);
     ldr(result, FieldMemOperand(result, Map::kConstructorOffset));
+  }
 
   // All done.
   bind(&done);

src/arm64/macro-assembler-arm64.cc

@@ -3816,13 +3816,14 @@ void MacroAssembler::TryGetFunctionPrototype(Register function,
                                              BoundFunctionAction action) {
   ASSERT(!AreAliased(function, result, scratch));
 
+  Label non_instance;
+  if (action == kMissOnBoundFunction) {
     // Check that the receiver isn't a smi.
     JumpIfSmi(function, miss);
 
     // Check that the function really is a function. Load map into result reg.
     JumpIfNotObjectType(function, result, scratch, JS_FUNCTION_TYPE, miss);
 
-  if (action == kMissOnBoundFunction) {
     Register scratch_w = scratch.W();
     Ldr(scratch,
         FieldMemOperand(function, JSFunction::kSharedFunctionInfoOffset));
@@ -3831,12 +3832,11 @@ void MacroAssembler::TryGetFunctionPrototype(Register function,
     Ldr(scratch_w,
         FieldMemOperand(scratch, SharedFunctionInfo::kCompilerHintsOffset));
     Tbnz(scratch, SharedFunctionInfo::kBoundFunction, miss);
-  }
 
     // Make sure that the function has an instance prototype.
-  Label non_instance;
     Ldrb(scratch, FieldMemOperand(result, Map::kBitFieldOffset));
     Tbnz(scratch, Map::kHasNonInstancePrototype, &non_instance);
+  }
 
   // Get the prototype or initial map from the function.
   Ldr(result,
@@ -3853,12 +3853,15 @@ void MacroAssembler::TryGetFunctionPrototype(Register function,
 
   // Get the prototype from the initial map.
   Ldr(result, FieldMemOperand(result, Map::kPrototypeOffset));
+
+  if (action == kMissOnBoundFunction) {
     B(&done);
 
     // Non-instance prototype: fetch prototype from constructor field in initial
     // map.
     Bind(&non_instance);
     Ldr(result, FieldMemOperand(result, Map::kConstructorOffset));
+  }
 
   // All done.
   Bind(&done);

src/ia32/macro-assembler-ia32.cc

@@ -1976,6 +1976,8 @@ void MacroAssembler::TryGetFunctionPrototype(Register function,
                                              Register scratch,
                                              Label* miss,
                                              bool miss_on_bound_function) {
+  Label non_instance;
+  if (miss_on_bound_function) {
     // Check that the receiver isn't a smi.
     JumpIfSmi(function, miss);
 
@@ -1983,20 +1985,18 @@ void MacroAssembler::TryGetFunctionPrototype(Register function,
     CmpObjectType(function, JS_FUNCTION_TYPE, result);
     j(not_equal, miss);
 
-  if (miss_on_bound_function) {
     // If a bound function, go to miss label.
     mov(scratch,
         FieldOperand(function, JSFunction::kSharedFunctionInfoOffset));
     BooleanBitTest(scratch, SharedFunctionInfo::kCompilerHintsOffset,
                    SharedFunctionInfo::kBoundFunction);
     j(not_zero, miss);
-  }
 
     // Make sure that the function has an instance prototype.
-  Label non_instance;
     movzx_b(scratch, FieldOperand(result, Map::kBitFieldOffset));
     test(scratch, Immediate(1 << Map::kHasNonInstancePrototype));
     j(not_zero, &non_instance);
+  }
 
   // Get the prototype or initial map from the function.
   mov(result,
@@ -2015,12 +2015,15 @@ void MacroAssembler::TryGetFunctionPrototype(Register function,
 
   // Get the prototype from the initial map.
   mov(result, FieldOperand(result, Map::kPrototypeOffset));
+
+  if (miss_on_bound_function) {
     jmp(&done);
 
     // Non-instance prototype: Fetch prototype from constructor field
     // in initial map.
     bind(&non_instance);
     mov(result, FieldOperand(result, Map::kConstructorOffset));
+  }
 
   // All done.
   bind(&done);

src/ic.cc

@@ -937,7 +937,8 @@ Handle<Code> LoadIC::CompileHandler(LookupResult* lookup, Handle<Object> object,
   // Use specialized code for getting prototype of functions.
   if (object->IsJSFunction() &&
       String::Equals(isolate()->factory()->prototype_string(), name) &&
-      Handle<JSFunction>::cast(object)->should_have_prototype()) {
+      Handle<JSFunction>::cast(object)->should_have_prototype() &&
+      !Handle<JSFunction>::cast(object)->map()->has_non_instance_prototype()) {
     Handle<Code> stub;
     FunctionPrototypeStub function_prototype_stub(isolate(), kind());
     return function_prototype_stub.GetCode();

src/x64/macro-assembler-x64.cc

@@ -3745,6 +3745,8 @@ void MacroAssembler::TryGetFunctionPrototype(Register function,
                                              Register result,
                                              Label* miss,
                                              bool miss_on_bound_function) {
+  Label non_instance;
+  if (miss_on_bound_function) {
     // Check that the receiver isn't a smi.
     testl(function, Immediate(kSmiTagMask));
     j(zero, miss);
@@ -3753,7 +3755,6 @@ void MacroAssembler::TryGetFunctionPrototype(Register function,
     CmpObjectType(function, JS_FUNCTION_TYPE, result);
     j(not_equal, miss);
 
-  if (miss_on_bound_function) {
     movp(kScratchRegister,
          FieldOperand(function, JSFunction::kSharedFunctionInfoOffset));
     // It's not smi-tagged (stored in the top half of a smi-tagged 8-byte
@@ -3762,13 +3763,12 @@ void MacroAssembler::TryGetFunctionPrototype(Register function,
         SharedFunctionInfo::kCompilerHintsOffset,
         SharedFunctionInfo::kBoundFunction);
     j(not_zero, miss);
-  }
 
     // Make sure that the function has an instance prototype.
-  Label non_instance;
     testb(FieldOperand(result, Map::kBitFieldOffset),
           Immediate(1 << Map::kHasNonInstancePrototype));
     j(not_zero, &non_instance, Label::kNear);
+  }
 
   // Get the prototype or initial map from the function.
   movp(result,
@@ -3787,12 +3787,15 @@ void MacroAssembler::TryGetFunctionPrototype(Register function,
 
   // Get the prototype from the initial map.
   movp(result, FieldOperand(result, Map::kPrototypeOffset));
+
+  if (miss_on_bound_function) {
     jmp(&done, Label::kNear);
 
     // Non-instance prototype: Fetch prototype from constructor field
     // in initial map.
     bind(&non_instance);
     movp(result, FieldOperand(result, Map::kConstructorOffset));
+  }
 
   // All done.
   bind(&done);