diff options
Diffstat (limited to 'chromium/v8/src/transitions-inl.h')
-rw-r--r-- | chromium/v8/src/transitions-inl.h | 40 |
1 files changed, 4 insertions, 36 deletions
diff --git a/chromium/v8/src/transitions-inl.h b/chromium/v8/src/transitions-inl.h index 5c7c28b6e5d..2387803c500 100644 --- a/chromium/v8/src/transitions-inl.h +++ b/chromium/v8/src/transitions-inl.h @@ -1,35 +1,11 @@ // 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. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. #ifndef V8_TRANSITIONS_INL_H_ #define V8_TRANSITIONS_INL_H_ -#include "objects-inl.h" -#include "transitions.h" +#include "src/transitions.h" namespace v8 { namespace internal { @@ -89,12 +65,6 @@ FixedArray* TransitionArray::GetPrototypeTransitions() { } -HeapObject* TransitionArray::UncheckedPrototypeTransitions() { - ASSERT(HasPrototypeTransitions()); - return reinterpret_cast<HeapObject*>(get(kPrototypeTransitionsIndex)); -} - - void TransitionArray::SetPrototypeTransitions(FixedArray* transitions, WriteBarrierMode mode) { ASSERT(IsFullTransitionArray()); @@ -115,9 +85,7 @@ Object** TransitionArray::GetPrototypeTransitionsSlot() { Object** TransitionArray::GetKeySlot(int transition_number) { ASSERT(!IsSimpleTransition()); ASSERT(transition_number < number_of_transitions()); - return HeapObject::RawField( - reinterpret_cast<HeapObject*>(this), - OffsetOfElementAt(ToKeyIndex(transition_number))); + return RawFieldOfElementAt(ToKeyIndex(transition_number)); } |