From 156fba0554c48030091424c705f2335cb75200bb Mon Sep 17 00:00:00 2001 From: "verwaest@chromium.org" Date: Wed, 30 Jul 2014 12:44:50 +0000 Subject: [PATCH] Fix BUG= R=ishell@chromium.org Review URL: https://codereview.chromium.org/431483003 git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22707 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/arm64/stub-cache-arm64.cc | 2 +- src/stub-cache.cc | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/arm64/stub-cache-arm64.cc b/src/arm64/stub-cache-arm64.cc index 00b2d7f3d7..32951e5dfb 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)); diff --git a/src/stub-cache.cc b/src/stub-cache.cc index 14bcc07039..5381ff1532 100644 --- a/src/stub-cache.cc +++ b/src/stub-cache.cc @@ -969,11 +969,11 @@ Handle NamedStoreHandlerCompiler::CompileStoreTransition( // Find the top object. Handle last; PrototypeIterator iter(isolate(), holder()); - do { + while (!iter.IsAtEnd()) { last = Handle::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);