diff options
author | Ben Noordhuis <info@bnoordhuis.nl> | 2014-05-12 05:07:46 +0200 |
---|---|---|
committer | Fedor Indutny <fedor@indutny.com> | 2014-06-12 17:46:17 -0700 |
commit | 3a280b2034e3ea438cd3a2e7acd1a4cd40112ac5 (patch) | |
tree | ae194faf83fd22ad890b421c2ebd537db1a52534 /deps/v8/src/property.cc | |
parent | 5413d9abe0df7e22bdb650a65f4c0ac462bbe147 (diff) | |
download | android-node-v8-3a280b2034e3ea438cd3a2e7acd1a4cd40112ac5.tar.gz android-node-v8-3a280b2034e3ea438cd3a2e7acd1a4cd40112ac5.tar.bz2 android-node-v8-3a280b2034e3ea438cd3a2e7acd1a4cd40112ac5.zip |
deps: upgrade v8 to 3.26.33
Signed-off-by: Fedor Indutny <fedor@indutny.com>
Diffstat (limited to 'deps/v8/src/property.cc')
-rw-r--r-- | deps/v8/src/property.cc | 70 |
1 files changed, 14 insertions, 56 deletions
diff --git a/deps/v8/src/property.cc b/deps/v8/src/property.cc index 2f72eec48e..e7d0c4e2f4 100644 --- a/deps/v8/src/property.cc +++ b/deps/v8/src/property.cc @@ -1,36 +1,14 @@ -// Copyright 2012 the V8 project authors. All rights reserved. -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// Copyright 2014 the V8 project authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. -#include "v8.h" +#include "property.h" + +#include "handles-inl.h" namespace v8 { namespace internal { - void LookupResult::Iterate(ObjectVisitor* visitor) { LookupResult* current = this; // Could be NULL. while (current != NULL) { @@ -51,6 +29,11 @@ void LookupResult::Print(FILE* out) { PrintF(out, "LookupResult:\n"); PrintF(out, " -cacheable = %s\n", IsCacheable() ? "true" : "false"); PrintF(out, " -attributes = %x\n", GetAttributes()); + if (IsTransition()) { + PrintF(out, " -transition target:\n"); + GetTransitionTarget()->Print(out); + PrintF(out, "\n"); + } switch (type()) { case NORMAL: PrintF(out, " -type = normal\n"); @@ -64,8 +47,9 @@ void LookupResult::Print(FILE* out) { break; case FIELD: PrintF(out, " -type = field\n"); - PrintF(out, " -index = %d", GetFieldIndex().field_index()); - PrintF(out, "\n"); + PrintF(out, " -index = %d\n", GetFieldIndex().field_index()); + PrintF(out, " -field type:\n"); + GetFieldType()->TypePrint(out); break; case CALLBACKS: PrintF(out, " -type = call backs\n"); @@ -78,29 +62,6 @@ void LookupResult::Print(FILE* out) { case INTERCEPTOR: PrintF(out, " -type = lookup interceptor\n"); break; - case TRANSITION: - switch (GetTransitionDetails().type()) { - case FIELD: - PrintF(out, " -type = map transition\n"); - PrintF(out, " -map:\n"); - GetTransitionTarget()->Print(out); - PrintF(out, "\n"); - return; - case CONSTANT: - PrintF(out, " -type = constant property transition\n"); - PrintF(out, " -map:\n"); - GetTransitionTarget()->Print(out); - PrintF(out, "\n"); - return; - case CALLBACKS: - PrintF(out, " -type = callbacks transition\n"); - PrintF(out, " -callback object:\n"); - GetCallbackObject()->Print(out); - return; - default: - UNREACHABLE(); - return; - } case NONEXISTENT: UNREACHABLE(); break; @@ -114,9 +75,6 @@ void Descriptor::Print(FILE* out) { PrintF(out, " @ "); GetValue()->ShortPrint(out); } - - #endif - } } // namespace v8::internal |