| Index: src/objects-inl.h
|
| diff --git a/src/objects-inl.h b/src/objects-inl.h
|
| index 6120a41812d53fb9731151f7e29c1e65ca77a97c..bc201320605a0349aa93ec489e1eb08df7be8a1b 100644
|
| --- a/src/objects-inl.h
|
| +++ b/src/objects-inl.h
|
| @@ -1,25 +1,55 @@
|
| -// 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.
|
| +// 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.
|
| +//
|
| +// Review notes:
|
| +//
|
| +// - The use of macros in these inline functions may seem superfluous
|
| +// but it is absolutely needed to make sure gcc generates optimal
|
| +// code. gcc is not happy when attempting to inline too deep.
|
| +//
|
|
|
| #ifndef V8_OBJECTS_INL_H_
|
| #define V8_OBJECTS_INL_H_
|
|
|
| +#include "elements.h"
|
| #include "objects.h"
|
| -
|
| #include "contexts.h"
|
| #include "conversions-inl.h"
|
| -#include "elements.h"
|
| -#include "factory.h"
|
| #include "heap.h"
|
| +#include "isolate.h"
|
| #include "heap-inl.h"
|
| -#include "incremental-marking.h"
|
| -#include "objects-visiting.h"
|
| #include "property.h"
|
| #include "spaces.h"
|
| #include "store-buffer.h"
|
| -#include "transitions-inl.h"
|
| #include "v8memory.h"
|
| +#include "factory.h"
|
| +#include "incremental-marking.h"
|
| +#include "transitions-inl.h"
|
| +#include "objects-visiting.h"
|
|
|
| namespace v8 {
|
| namespace internal {
|
| @@ -43,12 +73,6 @@ PropertyDetails PropertyDetails::AsDeleted() const {
|
| }
|
|
|
|
|
| -// Review notes:
|
| -//
|
| -// - The use of macros in these inline functions may seem superfluous
|
| -// but it is absolutely needed to make sure gcc generates optimal
|
| -// code. gcc is not happy when attempting to inline too deep.
|
| -//
|
| #define TYPE_CHECKER(type, instancetype) \
|
| bool Object::Is##type() { \
|
| return Object::IsHeapObject() && \
|
|
|