| Index: src/objects.h
|
| diff --git a/src/objects.h b/src/objects.h
|
| index 7771eb4058df4651869a2507a6ca02537ba21dbe..d161e72f80100e3d6c686a3eac9b96c821e1501b 100644
|
| --- a/src/objects.h
|
| +++ b/src/objects.h
|
| @@ -120,7 +120,7 @@
|
| // - Symbol
|
| // - HeapNumber
|
| // - Cell
|
| -// - JSGlobalPropertyCell
|
| +// - PropertyCell
|
| // - Code
|
| // - Map
|
| // - Oddball
|
| @@ -1017,7 +1017,7 @@ class MaybeObject BASE_EMBEDDED {
|
| V(UndetectableObject) \
|
| V(AccessCheckNeeded) \
|
| V(Cell) \
|
| - V(JSGlobalPropertyCell) \
|
| + V(PropertyCell) \
|
| V(ObjectHashTable) \
|
|
|
|
|
| @@ -4385,7 +4385,7 @@ class DeoptimizationOutputData: public FixedArray {
|
|
|
| // Forward declaration.
|
| class Cell;
|
| -class JSGlobalPropertyCell;
|
| +class PropertyCell;
|
|
|
| // TypeFeedbackCells is a fixed array used to hold the association between
|
| // cache cells and AST ids for code generated by the full compiler.
|
| @@ -6821,7 +6821,7 @@ class GlobalObject: public JSObject {
|
| DECL_ACCESSORS(global_receiver, JSObject)
|
|
|
| // Retrieve the property cell used to store a property.
|
| - JSGlobalPropertyCell* GetPropertyCell(LookupResult* result);
|
| + PropertyCell* GetPropertyCell(LookupResult* result);
|
|
|
| // This is like GetProperty, but is used when you know the lookup won't fail
|
| // by throwing an exception. This is for the debug and builtins global
|
| @@ -6833,7 +6833,7 @@ class GlobalObject: public JSObject {
|
| }
|
|
|
| // Ensure that the global object has a cell for the given property name.
|
| - static Handle<JSGlobalPropertyCell> EnsurePropertyCell(
|
| + static Handle<PropertyCell> EnsurePropertyCell(
|
| Handle<GlobalObject> global,
|
| Handle<Name> name);
|
| // TODO(kmillikin): This function can be eliminated once the stub cache is
|
| @@ -8570,7 +8570,7 @@ class Cell: public HeapObject {
|
|
|
| static inline Cell* FromValueAddress(Address value) {
|
| Object* result = FromAddress(value - kValueOffset);
|
| - ASSERT(result->IsCell() || result->IsJSGlobalPropertyCell());
|
| + ASSERT(result->IsCell() || result->IsPropertyCell());
|
| return static_cast<Cell*>(result);
|
| }
|
|
|
| @@ -8595,21 +8595,21 @@ class Cell: public HeapObject {
|
| };
|
|
|
|
|
| -class JSGlobalPropertyCell: public Cell {
|
| +class PropertyCell: public Cell {
|
| public:
|
| Type* type();
|
| void set_type(Type* value, WriteBarrierMode mode = UPDATE_WRITE_BARRIER);
|
|
|
| // Casting.
|
| - static inline JSGlobalPropertyCell* cast(Object* obj);
|
| + static inline PropertyCell* cast(Object* obj);
|
|
|
| inline Address TypeAddress() {
|
| return address() + kTypeOffset;
|
| }
|
|
|
| // Dispatched behavior.
|
| - DECLARE_PRINTER(JSGlobalPropertyCell)
|
| - DECLARE_VERIFIER(JSGlobalPropertyCell)
|
| + DECLARE_PRINTER(PropertyCell)
|
| + DECLARE_VERIFIER(PropertyCell)
|
|
|
| // Layout description.
|
| static const int kTypeOffset = kValueOffset + kPointerSize;
|
| @@ -8618,11 +8618,11 @@ class JSGlobalPropertyCell: public Cell {
|
| typedef FixedBodyDescriptor<
|
| kValueOffset,
|
| kTypeOffset + kPointerSize,
|
| - JSGlobalPropertyCell::kSize> BodyDescriptor;
|
| + PropertyCell::kSize> BodyDescriptor;
|
|
|
| private:
|
| DECL_ACCESSORS(type_raw, Object)
|
| - DISALLOW_IMPLICIT_CONSTRUCTORS(JSGlobalPropertyCell);
|
| + DISALLOW_IMPLICIT_CONSTRUCTORS(PropertyCell);
|
| };
|
|
|
|
|
|
|