Reviewers: dstence, michael_dawson, Toon Verwaest,
Description:
PPC: Fix keyed element access wrt string wrappers
Port 01f40e6ad6c8137708955494987857fbe489616b
[email protected], [email protected], [email protected]
BUG=
Please review this at https://codereview.chromium.org/1231633006/
Base URL: https://chromium.googlesource.com/v8/v8.git@master
Affected files (+15, -3 lines):
M src/ppc/macro-assembler-ppc.cc
Index: src/ppc/macro-assembler-ppc.cc
diff --git a/src/ppc/macro-assembler-ppc.cc b/src/ppc/macro-assembler-ppc.cc
index
d3671433b9988c0a0f933176679958fdfad04648..b646b36c19b700607047f4ab4206c9d010dbefda
100644
--- a/src/ppc/macro-assembler-ppc.cc
+++ b/src/ppc/macro-assembler-ppc.cc
@@ -4537,23 +4537,35 @@ void
MacroAssembler::JumpIfDictionaryInPrototypeChain(Register object,
Register scratch1,
Label* found) {
DCHECK(!scratch1.is(scratch0));
- Factory* factory = isolate()->factory();
Register current = scratch0;
- Label loop_again;
+ Label loop_again, end;
// scratch contained elements pointer.
mr(current, object);
+ LoadP(current, FieldMemOperand(current, HeapObject::kMapOffset));
+ LoadP(current, FieldMemOperand(current, Map::kPrototypeOffset));
+ CompareRoot(current, Heap::kNullValueRootIndex);
+ beq(&end);
// Loop based on the map going up the prototype chain.
bind(&loop_again);
LoadP(current, FieldMemOperand(current, HeapObject::kMapOffset));
+
+ STATIC_ASSERT(JS_PROXY_TYPE < JS_OBJECT_TYPE);
+ STATIC_ASSERT(JS_VALUE_TYPE < JS_OBJECT_TYPE);
+ lbz(scratch1, FieldMemOperand(current, Map::kInstanceTypeOffset));
+ cmpi(scratch1, Operand(JS_OBJECT_TYPE));
+ blt(found);
+
lbz(scratch1, FieldMemOperand(current, Map::kBitField2Offset));
DecodeField<Map::ElementsKindBits>(scratch1);
cmpi(scratch1, Operand(DICTIONARY_ELEMENTS));
beq(found);
LoadP(current, FieldMemOperand(current, Map::kPrototypeOffset));
- Cmpi(current, Operand(factory->null_value()), r0);
+ CompareRoot(current, Heap::kNullValueRootIndex);
bne(&loop_again);
+
+ bind(&end);
}
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
