Reviewers: Igor Sheludko,
Message:
PTAL
Description:
Fix
BUG=
Please review this at https://codereview.chromium.org/431483003/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+4, -4 lines):
M src/arm64/stub-cache-arm64.cc
M src/stub-cache.cc
Index: src/arm64/stub-cache-arm64.cc
diff --git a/src/arm64/stub-cache-arm64.cc b/src/arm64/stub-cache-arm64.cc
index
00b2d7f3d741029bcea9777074078ec4f0f206e3..32951e5dfbd6513c76f0c0fb74127e458c49b3a2
100644
--- a/src/arm64/stub-cache-arm64.cc
+++ b/src/arm64/stub-cache-arm64.cc
@@ -831,7 +831,7 @@ Register
NamedLoadHandlerCompiler::CallbackFrontend(Register object_reg,
ASSERT(!AreAliased(reg, scratch2, scratch3, dictionary));
if (!holder()->HasFastProperties()) {
- ASSERT(holder()->IsGlobalObject());
+ ASSERT(!holder()->IsGlobalObject());
// Load the properties dictionary.
__ Ldr(dictionary, FieldMemOperand(reg, JSObject::kPropertiesOffset));
Index: src/stub-cache.cc
diff --git a/src/stub-cache.cc b/src/stub-cache.cc
index
14bcc07039f607ca5e516abc04ac77b82e944a45..5381ff15326321cdc0cd7aab28221bc0bd405f58
100644
--- a/src/stub-cache.cc
+++ b/src/stub-cache.cc
@@ -969,11 +969,11 @@ Handle<Code>
NamedStoreHandlerCompiler::CompileStoreTransition(
// Find the top object.
Handle<JSObject> last;
PrototypeIterator iter(isolate(), holder());
- do {
+ while (!iter.IsAtEnd()) {
last = Handle<JSObject>::cast(PrototypeIterator::GetCurrent(iter));
iter.Advance();
- } while (!iter.IsAtEnd());
- set_holder(last);
+ }
+ if (!last.is_null()) set_holder(last);
}
Register holder_reg = FrontendHeader(receiver(), name, &miss);
--
--
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.
