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

Unified Diff: src/full-codegen/x64/full-codegen-x64.cc

Issue 1351493002: Extra code to diagnose a crash bug. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Code comments. Created 5 years, 3 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/builtins.cc ('k') | src/ic/arm/ic-arm.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/full-codegen/x64/full-codegen-x64.cc
diff --git a/src/full-codegen/x64/full-codegen-x64.cc b/src/full-codegen/x64/full-codegen-x64.cc
index 3f0dec1dd7dc165b25857418e0c2d01320439671..b9f414bc7d245e6a2f1e5943681e447700a1e5fc 100644
--- a/src/full-codegen/x64/full-codegen-x64.cc
+++ b/src/full-codegen/x64/full-codegen-x64.cc
@@ -2262,14 +2262,15 @@ void FullCodeGenerator::EmitNamedPropertyLoad(Property* prop) {
if (FeedbackVector()->GetIndex(prop->PropertyFeedbackSlot()) == 6) {
__ Pop(LoadDescriptor::ReceiverRegister());
- Label ok;
+ Label ok, sound_alarm;
__ JumpIfSmi(rax, &ok, Label::kNear);
__ movp(rbx, FieldOperand(rax, HeapObject::kMapOffset));
- __ CmpInstanceType(rbx, LAST_PRIMITIVE_TYPE);
- __ j(below_equal, &ok, Label::kNear);
- __ CmpInstanceType(rbx, FIRST_JS_RECEIVER_TYPE);
- __ j(above_equal, &ok, Label::kNear);
+ __ CompareRoot(rbx, Heap::kMetaMapRootIndex);
+ __ j(equal, &sound_alarm);
+ __ CompareRoot(rbx, Heap::kFixedArrayMapRootIndex);
+ __ j(not_equal, &ok, Label::kNear);
+ __ bind(&sound_alarm);
__ Push(Smi::FromInt(0xaabbccdd));
__ Push(LoadDescriptor::ReceiverRegister());
__ movp(rbx, FieldOperand(LoadDescriptor::ReceiverRegister(),
« no previous file with comments | « src/builtins.cc ('k') | src/ic/arm/ic-arm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698