[objects] Rename macros from DECLARE_ to DECL_ for consistency.

R=marja@chromium.org
BUG=

Review-Url: https://codereview.chromium.org/2961253002
Cr-Commit-Position: refs/heads/master@{#46321}

src/feedback-vector.h

@@ -177,7 +177,7 @@ class FeedbackVectorSpecBase {
   void Print();
 #endif  // OBJECT_PRINT
 
-  DECLARE_PRINTER(FeedbackVectorSpec)
+  DECL_PRINTER(FeedbackVectorSpec)
 
  private:
   inline FeedbackSlot AddSlot(FeedbackSlotKind kind);
@@ -275,7 +275,7 @@ class FeedbackMetadata : public FixedArray {
   void Print();
 #endif  // OBJECT_PRINT
 
-  DECLARE_PRINTER(FeedbackMetadata)
+  DECL_PRINTER(FeedbackMetadata)
 
   static const char* Kind2String(FeedbackSlotKind kind);
   bool HasTypeProfileSlot() const;
@@ -387,7 +387,7 @@ class FeedbackVector : public FixedArray {
   void Print();
 #endif  // OBJECT_PRINT
 
-  DECLARE_PRINTER(FeedbackVector)
+  DECL_PRINTER(FeedbackVector)
 
   // Clears the vector slots.
   void ClearSlots(JSFunction* host_function);

src/objects/arguments.h

@@ -24,8 +24,8 @@ class JSArgumentsObject : public JSObject {
 
   DECL_ACCESSORS(length, Object)
 
-  DECLARE_VERIFIER(JSArgumentsObject)
-  DECLARE_CAST(JSArgumentsObject)
+  DECL_VERIFIER(JSArgumentsObject)
+  DECL_CAST(JSArgumentsObject)
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(JSArgumentsObject);
@@ -43,8 +43,8 @@ class JSSloppyArgumentsObject : public JSArgumentsObject {
 
   DECL_ACCESSORS(callee, Object)
 
-  DECLARE_VERIFIER(JSSloppyArgumentsObject)
-  DECLARE_CAST(JSSloppyArgumentsObject)
+  DECL_VERIFIER(JSSloppyArgumentsObject)
+  DECL_CAST(JSSloppyArgumentsObject)
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(JSSloppyArgumentsObject);
@@ -57,7 +57,7 @@ class JSStrictArgumentsObject : public JSArgumentsObject {
   // Offsets of object fields.
   static const int kSize = JSArgumentsObject::kHeaderSize;
 
-  DECLARE_CAST(JSStrictArgumentsObject)
+  DECL_CAST(JSStrictArgumentsObject)
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(JSStrictArgumentsObject);
@@ -98,7 +98,7 @@ class SloppyArgumentsElements : public FixedArray {
   inline Object* get_mapped_entry(uint32_t entry);
   inline void set_mapped_entry(uint32_t entry, Object* object);
 
-  DECLARE_CAST(SloppyArgumentsElements)
+  DECL_CAST(SloppyArgumentsElements)
 #ifdef VERIFY_HEAP
   void SloppyArgumentsElementsVerify(JSSloppyArgumentsObject* holder);
 #endif
@@ -120,11 +120,11 @@ class AliasedArgumentsEntry : public Struct {
   inline int aliased_context_slot() const;
   inline void set_aliased_context_slot(int count);
 
-  DECLARE_CAST(AliasedArgumentsEntry)
+  DECL_CAST(AliasedArgumentsEntry)
 
   // Dispatched behavior.
-  DECLARE_PRINTER(AliasedArgumentsEntry)
-  DECLARE_VERIFIER(AliasedArgumentsEntry)
+  DECL_PRINTER(AliasedArgumentsEntry)
+  DECL_VERIFIER(AliasedArgumentsEntry)
 
   static const int kAliasedContextSlot = HeapObject::kHeaderSize;
   static const int kSize = kAliasedContextSlot + kPointerSize;

src/objects/code-cache.h

@@ -96,7 +96,7 @@ class CodeCacheHashTable
 
   Code* Lookup(Name* name, Code::Flags flags);
 
-  DECLARE_CAST(CodeCacheHashTable)
+  DECL_CAST(CodeCacheHashTable)
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(CodeCacheHashTable);

src/objects/compilation-cache.h

@@ -97,7 +97,7 @@ class CompilationCacheTable
   void Age();
   static const int kHashGenerations = 10;
 
-  DECLARE_CAST(CompilationCacheTable)
+  DECL_CAST(CompilationCacheTable)
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(CompilationCacheTable);

src/objects/debug-objects.h

@@ -84,11 +84,11 @@ class DebugInfo : public Struct {
   bool ClearCoverageInfo();
   DECL_ACCESSORS(coverage_info, Object)
 
-  DECLARE_CAST(DebugInfo)
+  DECL_CAST(DebugInfo)
 
   // Dispatched behavior.
-  DECLARE_PRINTER(DebugInfo)
-  DECLARE_VERIFIER(DebugInfo)
+  DECL_PRINTER(DebugInfo)
+  DECL_VERIFIER(DebugInfo)
 
   static const int kSharedFunctionInfoOffset = Struct::kHeaderSize;
   static const int kDebuggerHintsOffset =
@@ -134,7 +134,7 @@ class BreakPointInfo : public Tuple2 {
 
   int GetStatementPosition(Handle<DebugInfo> debug_info);
 
-  DECLARE_CAST(BreakPointInfo)
+  DECL_CAST(BreakPointInfo)
 
   static const int kSourcePositionOffset = kValue1Offset;
   static const int kBreakPointObjectsOffset = kValue2Offset;
@@ -160,7 +160,7 @@ class CoverageInfo : public FixedArray {
     return slot_count * kSlotIndexCount + kFirstSlotIndex;
   }
 
-  DECLARE_CAST(CoverageInfo)
+  DECL_CAST(CoverageInfo)
 
  private:
   static int FirstIndexForSlot(int slot_index) {

src/objects/descriptor-array.h

@@ -116,7 +116,7 @@ class DescriptorArray : public FixedArray {
       Isolate* isolate, int number_of_descriptors, int slack,
       PretenureFlag pretenure = NOT_TENURED);
 
-  DECLARE_CAST(DescriptorArray)
+  DECL_CAST(DescriptorArray)
 
   // Constant for denoting key was not found.
   static const int kNotFound = -1;

src/objects/dictionary.h

@@ -167,7 +167,7 @@ class BaseNameDictionary : public Dictionary<Derived, Shape> {
 class NameDictionary
     : public BaseNameDictionary<NameDictionary, NameDictionaryShape> {
  public:
-  DECLARE_CAST(NameDictionary)
+  DECL_CAST(NameDictionary)
 
   static const int kEntryDetailsIndex = 2;
   static const int kInitialCapacity = 2;
@@ -196,7 +196,7 @@ class GlobalDictionaryShape : public NameDictionaryShape {
 class GlobalDictionary
     : public BaseNameDictionary<GlobalDictionary, GlobalDictionaryShape> {
  public:
-  DECLARE_CAST(GlobalDictionary)
+  DECL_CAST(GlobalDictionary)
 
   inline Object* ValueAt(int entry);
   inline PropertyCell* CellAt(int entry);
@@ -253,7 +253,7 @@ extern template class EXPORT_TEMPLATE_DECLARE(V8_EXPORT_PRIVATE)
 class SeededNumberDictionary
     : public Dictionary<SeededNumberDictionary, SeededNumberDictionaryShape> {
  public:
-  DECLARE_CAST(SeededNumberDictionary)
+  DECL_CAST(SeededNumberDictionary)
 
   // Type specific at put (default NONE attributes is used when adding).
   MUST_USE_RESULT static Handle<SeededNumberDictionary> Set(
@@ -301,7 +301,7 @@ class UnseededNumberDictionary
     : public Dictionary<UnseededNumberDictionary,
                         UnseededNumberDictionaryShape> {
  public:
-  DECLARE_CAST(UnseededNumberDictionary)
+  DECL_CAST(UnseededNumberDictionary)
 
   // Type specific at put (default NONE attributes is used when adding).
   MUST_USE_RESULT static Handle<UnseededNumberDictionary> Set(

src/objects/frame-array.h

@@ -29,11 +29,11 @@ class Handle;
 // Container object for data collected during simple stack trace captures.
 class FrameArray : public FixedArray {
  public:
-#define DECLARE_FRAME_ARRAY_ACCESSORS(name, type) \
-  inline type* name(int frame_ix) const;          \
+#define DECL_FRAME_ARRAY_ACCESSORS(name, type) \
+  inline type* name(int frame_ix) const;       \
   inline void Set##name(int frame_ix, type* value);
-  FRAME_ARRAY_FIELD_LIST(DECLARE_FRAME_ARRAY_ACCESSORS)
-#undef DECLARE_FRAME_ARRAY_ACCESSORS
+  FRAME_ARRAY_FIELD_LIST(DECL_FRAME_ARRAY_ACCESSORS)
+#undef DECL_FRAME_ARRAY_ACCESSORS
 
   inline bool IsWasmFrame(int frame_ix) const;
   inline bool IsWasmInterpretedFrame(int frame_ix) const;
@@ -62,7 +62,7 @@ class FrameArray : public FixedArray {
       int wasm_function_index, Handle<AbstractCode> code, int offset,
       int flags);
 
-  DECLARE_CAST(FrameArray)
+  DECL_CAST(FrameArray)
 
  private:
   // The underlying fixed array embodies a captured stack trace. Frame i

src/objects/hash-table.h

@@ -140,7 +140,7 @@ class HashTable : public HashTableBase {
       PretenureFlag pretenure = NOT_TENURED,
       MinimumCapacity capacity_option = USE_DEFAULT_MINIMUM_CAPACITY);
 
-  DECLARE_CAST(HashTable)
+  DECL_CAST(HashTable)
 
   // Garbage collection support.
   void IteratePrefix(ObjectVisitor* visitor);
@@ -282,7 +282,7 @@ class ObjectHashTable
   typedef HashTable<ObjectHashTable, ObjectHashTableShape> DerivedHashTable;
 
  public:
-  DECLARE_CAST(ObjectHashTable)
+  DECL_CAST(ObjectHashTable)
 
   // Attempt to shrink hash table after removal of key.
   MUST_USE_RESULT static inline Handle<ObjectHashTable> Shrink(
@@ -337,7 +337,7 @@ class ObjectHashSet : public HashTable<ObjectHashSet, ObjectHashSetShape> {
   inline bool Has(Isolate* isolate, Handle<Object> key, int32_t hash);
   inline bool Has(Isolate* isolate, Handle<Object> key);
 
-  DECLARE_CAST(ObjectHashSet)
+  DECL_CAST(ObjectHashSet)
 };
 
 // OrderedHashTable is a HashTable with Object keys that preserves
@@ -543,7 +543,7 @@ class OrderedHashTable : public FixedArray {
 
 class OrderedHashSet : public OrderedHashTable<OrderedHashSet, 1> {
  public:
-  DECLARE_CAST(OrderedHashSet)
+  DECL_CAST(OrderedHashSet)
 
   static Handle<OrderedHashSet> Add(Handle<OrderedHashSet> table,
                                     Handle<Object> value);
@@ -553,7 +553,7 @@ class OrderedHashSet : public OrderedHashTable<OrderedHashSet, 1> {
 
 class OrderedHashMap : public OrderedHashTable<OrderedHashMap, 2> {
  public:
-  DECLARE_CAST(OrderedHashMap)
+  DECL_CAST(OrderedHashMap)
 
   // Returns a value if the OrderedHashMap contains the key, otherwise
   // returns undefined.
@@ -584,7 +584,7 @@ class WeakHashTable : public HashTable<WeakHashTable, WeakHashTableShape<2>> {
   typedef HashTable<WeakHashTable, WeakHashTableShape<2>> DerivedHashTable;
 
  public:
-  DECLARE_CAST(WeakHashTable)
+  DECL_CAST(WeakHashTable)
 
   // Looks up the value associated with the given key. The hole value is
   // returned in case the key is not present.
@@ -764,7 +764,7 @@ class SmallOrderedHashTable : public HeapObject {
   // SmallOrderedHashTable::Grow.
   static const int kGrowthHack = 256;
 
-  DECLARE_VERIFIER(SmallOrderedHashTable)
+  DECL_VERIFIER(SmallOrderedHashTable)
 
  protected:
   // This is used for accessing the non |DataTable| part of the
@@ -792,9 +792,9 @@ class SmallOrderedHashTable : public HeapObject {
 
 class SmallOrderedHashSet : public SmallOrderedHashTable<SmallOrderedHashSet> {
  public:
-  DECLARE_CAST(SmallOrderedHashSet)
+  DECL_CAST(SmallOrderedHashSet)
 
-  DECLARE_PRINTER(SmallOrderedHashSet)
+  DECL_PRINTER(SmallOrderedHashSet)
 
   static const int kKeyIndex = 0;
   static const int kEntrySize = 1;
@@ -808,9 +808,9 @@ class SmallOrderedHashSet : public SmallOrderedHashTable<SmallOrderedHashSet> {
 
 class SmallOrderedHashMap : public SmallOrderedHashTable<SmallOrderedHashMap> {
  public:
-  DECLARE_CAST(SmallOrderedHashMap)
+  DECL_CAST(SmallOrderedHashMap)
 
-  DECLARE_PRINTER(SmallOrderedHashMap)
+  DECL_PRINTER(SmallOrderedHashMap)
 
   static const int kKeyIndex = 0;
   static const int kValueIndex = 1;
@@ -887,10 +887,10 @@ class JSSetIterator
     : public OrderedHashTableIterator<JSSetIterator, OrderedHashSet> {
  public:
   // Dispatched behavior.
-  DECLARE_PRINTER(JSSetIterator)
-  DECLARE_VERIFIER(JSSetIterator)
+  DECL_PRINTER(JSSetIterator)
+  DECL_VERIFIER(JSSetIterator)
 
-  DECLARE_CAST(JSSetIterator)
+  DECL_CAST(JSSetIterator)
 
   // Called by |Next| to populate the array. This allows the subclasses to
   // populate the array differently.
@@ -904,10 +904,10 @@ class JSMapIterator
     : public OrderedHashTableIterator<JSMapIterator, OrderedHashMap> {
  public:
   // Dispatched behavior.
-  DECLARE_PRINTER(JSMapIterator)
-  DECLARE_VERIFIER(JSMapIterator)
+  DECL_PRINTER(JSMapIterator)
+  DECL_VERIFIER(JSMapIterator)
 
-  DECLARE_CAST(JSMapIterator)
+  DECL_CAST(JSMapIterator)
 
   // Called by |Next| to populate the array. This allows the subclasses to
   // populate the array differently.

src/objects/literal-objects.h

@@ -31,7 +31,7 @@ class BoilerplateDescription : public FixedArray {
 
   void set_backing_store_size(Isolate* isolate, int backing_store_size);
 
-  DECLARE_CAST(BoilerplateDescription)
+  DECL_CAST(BoilerplateDescription)
 
  private:
   bool has_number_of_properties() const;
@@ -45,7 +45,7 @@ class ConstantElementsPair : public Tuple2 {
   DECL_INT_ACCESSORS(elements_kind)
   DECL_ACCESSORS(constant_values, FixedArrayBase)
 
-  DECLARE_CAST(ConstantElementsPair)
+  DECL_CAST(ConstantElementsPair)
 
   static const int kElementsKindOffset = kValue1Offset;
   static const int kConstantValuesOffset = kValue2Offset;

src/objects/map.h

@@ -493,7 +493,7 @@ class Map : public HeapObject {
   // Returns the number of enumerable properties.
   int NumberOfEnumerableProperties();
 
-  DECLARE_CAST(Map)
+  DECL_CAST(Map)
 
   // Code cache operations.
 
@@ -554,8 +554,8 @@ class Map : public HeapObject {
   static Handle<WeakCell> WeakCellForMap(Handle<Map> map);
 
   // Dispatched behavior.
-  DECLARE_PRINTER(Map)
-  DECLARE_VERIFIER(Map)
+  DECL_PRINTER(Map)
+  DECL_VERIFIER(Map)
 
 #ifdef VERIFY_HEAP
   void DictionaryMapVerify();
@@ -791,11 +791,11 @@ class NormalizedMapCache : public FixedArray {
 
   void Clear();
 
-  DECLARE_CAST(NormalizedMapCache)
+  DECL_CAST(NormalizedMapCache)
 
   static inline bool IsNormalizedMapCache(const HeapObject* obj);
 
-  DECLARE_VERIFIER(NormalizedMapCache)
+  DECL_VERIFIER(NormalizedMapCache)
  private:
   static const int kEntries = 64;
 

src/objects/module-info.h

@@ -24,7 +24,7 @@ class Zone;
 // ModuleInfo is to ModuleDescriptor what ScopeInfo is to Scope.
 class ModuleInfo : public FixedArray {
  public:
-  DECLARE_CAST(ModuleInfo)
+  DECL_CAST(ModuleInfo)
 
   static Handle<ModuleInfo> New(Isolate* isolate, Zone* zone,
                                 ModuleDescriptor* descr);
@@ -93,9 +93,9 @@ class ModuleInfo : public FixedArray {
 
 class ModuleInfoEntry : public Struct {
  public:
-  DECLARE_CAST(ModuleInfoEntry)
-  DECLARE_PRINTER(ModuleInfoEntry)
-  DECLARE_VERIFIER(ModuleInfoEntry)
+  DECL_CAST(ModuleInfoEntry)
+  DECL_PRINTER(ModuleInfoEntry)
+  DECL_VERIFIER(ModuleInfoEntry)
 
   DECL_ACCESSORS(export_name, Object)
   DECL_ACCESSORS(local_name, Object)

src/objects/name.h

@@ -47,9 +47,9 @@ class Name : public HeapObject {
   MUST_USE_RESULT static MaybeHandle<String> ToFunctionName(
       Handle<Name> name, Handle<String> prefix);
 
-  DECLARE_CAST(Name)
+  DECL_CAST(Name)
 
-  DECLARE_PRINTER(Name)
+  DECL_PRINTER(Name)
 #if V8_TRACE_MAPS
   void NameShortPrint();
   int NameShortPrint(Vector<char> str);
@@ -148,11 +148,11 @@ class Symbol : public Name {
   // Symbol.keyFor on such a symbol simply needs to return the attached name.
   DECL_BOOLEAN_ACCESSORS(is_public)
 
-  DECLARE_CAST(Symbol)
+  DECL_CAST(Symbol)
 
   // Dispatched behavior.
-  DECLARE_PRINTER(Symbol)
-  DECLARE_VERIFIER(Symbol)
+  DECL_PRINTER(Symbol)
+  DECL_VERIFIER(Symbol)
 
   // Layout description.
   static const int kNameOffset = Name::kSize;

src/objects/object-macros-undef.h

@@ -5,7 +5,7 @@
 #undef DECL_BOOLEAN_ACCESSORS
 #undef DECL_INT_ACCESSORS
 #undef DECL_ACCESSORS
-#undef DECLARE_CAST
+#undef DECL_CAST
 #undef CAST_ACCESSOR
 #undef INT_ACCESSORS
 #undef ACCESSORS_CHECKED2
@@ -56,6 +56,6 @@
 #undef RELAXED_READ_BYTE_FIELD
 #undef WRITE_BYTE_FIELD
 #undef RELAXED_WRITE_BYTE_FIELD
-#undef DECLARE_VERIFIER
+#undef DECL_VERIFIER
 #undef DEFINE_DEOPT_ELEMENT_ACCESSORS
 #undef DEFINE_DEOPT_ENTRY_ACCESSORS

src/objects/object-macros.h

@@ -25,7 +25,7 @@
   inline void set_##name(type* value, \
                          WriteBarrierMode mode = UPDATE_WRITE_BARRIER);
 
-#define DECLARE_CAST(type)                   \
+#define DECL_CAST(type)                      \
   INLINE(static type* cast(Object* object)); \
   INLINE(static const type* cast(const Object* object));
 
@@ -258,9 +258,9 @@
                       static_cast<base::Atomic8>(value));
 
 #ifdef VERIFY_HEAP
-#define DECLARE_VERIFIER(Name) void Name##Verify();
+#define DECL_VERIFIER(Name) void Name##Verify();
 #else
-#define DECLARE_VERIFIER(Name)
+#define DECL_VERIFIER(Name)
 #endif
 
 #define DEFINE_DEOPT_ELEMENT_ACCESSORS(name, type)       \

src/objects/regexp-match-info.h

@@ -48,7 +48,7 @@ class V8_EXPORT_PRIVATE RegExpMatchInfo : NON_EXPORTED_BASE(public FixedArray) {
   static Handle<RegExpMatchInfo> ReserveCaptures(
       Handle<RegExpMatchInfo> match_info, int capture_count);
 
-  DECLARE_CAST(RegExpMatchInfo)
+  DECL_CAST(RegExpMatchInfo)
 
   static const int kNumberOfCapturesIndex = 0;
   static const int kLastSubjectIndex = 1;

src/objects/scope-info.h

@@ -32,7 +32,7 @@ class Zone;
 // routines.
 class ScopeInfo : public FixedArray {
  public:
-  DECLARE_CAST(ScopeInfo)
+  DECL_CAST(ScopeInfo)
 
   // Return the type of this scope.
   ScopeType scope_type();

src/objects/script.h

@@ -106,7 +106,7 @@ class Script : public Struct {
   inline v8::ScriptOriginOptions origin_options();
   inline void set_origin_options(ScriptOriginOptions origin_options);
 
-  DECLARE_CAST(Script)
+  DECL_CAST(Script)
 
   // If script source is an external string, check that the underlying
   // resource is accessible. Otherwise, always return true.
@@ -179,8 +179,8 @@ class Script : public Struct {
   bool HasPreparsedScopeData() const;
 
   // Dispatched behavior.
-  DECLARE_PRINTER(Script)
-  DECLARE_VERIFIER(Script)
+  DECL_PRINTER(Script)
+  DECL_VERIFIER(Script)
 
   static const int kSourceOffset = HeapObject::kHeaderSize;
   static const int kNameOffset = kSourceOffset + kPointerSize;

src/objects/shared-function-info.h

@@ -374,8 +374,8 @@ class SharedFunctionInfo : public HeapObject {
   void SetExpectedNofPropertiesFromEstimate(FunctionLiteral* literal);
 
   // Dispatched behavior.
-  DECLARE_PRINTER(SharedFunctionInfo)
-  DECLARE_VERIFIER(SharedFunctionInfo)
+  DECL_PRINTER(SharedFunctionInfo)
+  DECL_VERIFIER(SharedFunctionInfo)
 
   void ResetForNewContext(int new_ic_age);
 
@@ -410,7 +410,7 @@ class SharedFunctionInfo : public HeapObject {
     DISALLOW_COPY_AND_ASSIGN(GlobalIterator);
   };
 
-  DECLARE_CAST(SharedFunctionInfo)
+  DECL_CAST(SharedFunctionInfo)
 
   // Constants.
   static const int kDontAdaptArgumentsSentinel = -1;

src/objects/string-table.h

@@ -69,7 +69,7 @@ class StringTable : public HashTable<StringTable, StringTableShape> {
 
   static void EnsureCapacityForDeserialization(Isolate* isolate, int expected);
 
-  DECLARE_CAST(StringTable)
+  DECL_CAST(StringTable)
 
  private:
   template <bool seq_one_byte>
@@ -95,7 +95,7 @@ class StringSet : public HashTable<StringSet, StringSetShape> {
                                Handle<String> name);
   bool Has(Handle<String> name);
 
-  DECLARE_CAST(StringSet)
+  DECL_CAST(StringSet)
 };
 
 }  // namespace internal

src/objects/string.h

@@ -314,7 +314,7 @@ class String : public Name {
   enum TrimMode { kTrim, kTrimLeft, kTrimRight };
   static Handle<String> Trim(Handle<String> string, TrimMode mode);
 
-  DECLARE_CAST(String)
+  DECL_CAST(String)
 
   void PrintOn(FILE* out);
 
@@ -327,8 +327,8 @@ class String : public Name {
 #if defined(DEBUG) || defined(OBJECT_PRINT)
   char* ToAsciiArray();
 #endif
-  DECLARE_PRINTER(String)
-  DECLARE_VERIFIER(String)
+  DECL_PRINTER(String)
+  DECL_VERIFIER(String)
 
   inline bool IsFlat();
 
@@ -458,7 +458,7 @@ class String : public Name {
 // The SeqString abstract class captures sequential string values.
 class SeqString : public String {
  public:
-  DECLARE_CAST(SeqString)
+  DECL_CAST(SeqString)
 
   // Layout description.
   static const int kHeaderSize = String::kSize;
@@ -488,7 +488,7 @@ class SeqOneByteString : public SeqString {
 
   inline uint8_t* GetChars();
 
-  DECLARE_CAST(SeqOneByteString)
+  DECL_CAST(SeqOneByteString)
 
   // Garbage collection support.  This method is called by the
   // garbage collector to compute the actual size of an OneByteString
@@ -530,7 +530,7 @@ class SeqTwoByteString : public SeqString {
   // For regexp code.
   const uint16_t* SeqTwoByteStringGetData(unsigned start);
 
-  DECLARE_CAST(SeqTwoByteString)
+  DECL_CAST(SeqTwoByteString)
 
   // Garbage collection support.  This method is called by the
   // garbage collector to compute the actual size of a TwoByteString
@@ -584,7 +584,7 @@ class ConsString : public String {
   // Dispatched behavior.
   V8_EXPORT_PRIVATE uint16_t ConsStringGet(int index);
 
-  DECLARE_CAST(ConsString)
+  DECL_CAST(ConsString)
 
   // Layout description.
   static const int kFirstOffset = POINTER_SIZE_ALIGN(String::kSize);
@@ -599,7 +599,7 @@ class ConsString : public String {
   // No weak fields.
   typedef BodyDescriptor BodyDescriptorWeak;
 
-  DECLARE_VERIFIER(ConsString)
+  DECL_VERIFIER(ConsString)
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(ConsString);
@@ -621,8 +621,8 @@ class ThinString : public String {
 
   V8_EXPORT_PRIVATE uint16_t ThinStringGet(int index);
 
-  DECLARE_CAST(ThinString)
-  DECLARE_VERIFIER(ThinString)
+  DECL_CAST(ThinString)
+  DECL_VERIFIER(ThinString)
 
   // Layout description.
   static const int kActualOffset = String::kSize;
@@ -659,7 +659,7 @@ class SlicedString : public String {
   // Dispatched behavior.
   V8_EXPORT_PRIVATE uint16_t SlicedStringGet(int index);
 
-  DECLARE_CAST(SlicedString)
+  DECL_CAST(SlicedString)
 
   // Layout description.
   static const int kParentOffset = POINTER_SIZE_ALIGN(String::kSize);
@@ -675,7 +675,7 @@ class SlicedString : public String {
   // No weak fields.
   typedef BodyDescriptor BodyDescriptorWeak;
 
-  DECLARE_VERIFIER(SlicedString)
+  DECL_VERIFIER(SlicedString)
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(SlicedString);
@@ -692,7 +692,7 @@ class SlicedString : public String {
 // API.  Therefore, ExternalStrings should not be used internally.
 class ExternalString : public String {
  public:
-  DECLARE_CAST(ExternalString)
+  DECL_CAST(ExternalString)
 
   // Layout description.
   static const int kResourceOffset = POINTER_SIZE_ALIGN(String::kSize);
@@ -732,7 +732,7 @@ class ExternalOneByteString : public ExternalString {
   // Dispatched behavior.
   inline uint16_t ExternalOneByteStringGet(int index);
 
-  DECLARE_CAST(ExternalOneByteString)
+  DECL_CAST(ExternalOneByteString)
 
   class BodyDescriptor;
   // No weak fields.
@@ -768,7 +768,7 @@ class ExternalTwoByteString : public ExternalString {
   // For regexp code.
   inline const uint16_t* ExternalTwoByteStringGetData(unsigned start);
 
-  DECLARE_CAST(ExternalTwoByteString)
+  DECL_CAST(ExternalTwoByteString)
 
   class BodyDescriptor;
   // No weak fields.