Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(59)

Unified Diff: src/x64/builtins-x64.cc

Issue 1576423003: Fix the receiver check in the HandleFastApiCall builtin. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Rebased. Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/ppc/builtins-ppc.cc ('k') | src/x87/builtins-x87.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/x64/builtins-x64.cc
diff --git a/src/x64/builtins-x64.cc b/src/x64/builtins-x64.cc
index eaef19074555de145486600bcdbfa0f4586eb749..cb092f2f2d72890080ad926628da7af870478ea9 100644
--- a/src/x64/builtins-x64.cc
+++ b/src/x64/builtins-x64.cc
@@ -2436,17 +2436,10 @@ static void CompatibleReceiverCheck(MacroAssembler* masm, Register receiver,
__ j(equal, &receiver_check_passed, Label::kNear);
// Walk the prototype chain.
+ __ movp(map, FieldOperand(receiver, HeapObject::kMapOffset));
Label prototype_loop_start;
__ bind(&prototype_loop_start);
- // End if the receiver is null or if it's a hidden prototype.
- __ CompareRoot(receiver, Heap::kNullValueRootIndex);
- __ j(equal, receiver_check_failed, Label::kNear);
- __ movp(map, FieldOperand(receiver, HeapObject::kMapOffset));
- __ testq(FieldOperand(map, Map::kBitField3Offset),
- Immediate(Map::IsHiddenPrototype::kMask));
- __ j(not_zero, receiver_check_failed, Label::kNear);
-
// Get the constructor, if any.
__ GetMapConstructor(constructor, map, kScratchRegister);
__ CmpInstanceType(kScratchRegister, JS_FUNCTION_TYPE);
@@ -2478,9 +2471,17 @@ static void CompatibleReceiverCheck(MacroAssembler* masm, Register receiver,
FieldOperand(type, FunctionTemplateInfo::kParentTemplateOffset));
__ jmp(&function_template_loop, Label::kNear);
- // Load the next prototype and iterate.
+ // Load the next prototype.
__ bind(&next_prototype);
__ movp(receiver, FieldOperand(map, Map::kPrototypeOffset));
+ // End if the prototype is null or not hidden.
+ __ CompareRoot(receiver, Heap::kNullValueRootIndex);
+ __ j(equal, receiver_check_failed);
+ __ movp(map, FieldOperand(receiver, HeapObject::kMapOffset));
+ __ testq(FieldOperand(map, Map::kBitField3Offset),
+ Immediate(Map::IsHiddenPrototype::kMask));
+ __ j(zero, receiver_check_failed);
+ // Iterate.
__ jmp(&prototype_loop_start, Label::kNear);
__ bind(&receiver_check_passed);
« no previous file with comments | « src/ppc/builtins-ppc.cc ('k') | src/x87/builtins-x87.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698