Index: src/objects.cc |
diff --git a/src/objects.cc b/src/objects.cc |
index b176522447e4a594783b92a4a43dc8469a75e34a..091a8e70fcdefb3f46fb47ba552314780d69f93c 100644 |
--- a/src/objects.cc |
+++ b/src/objects.cc |
@@ -7456,7 +7456,7 @@ class CodeCacheHashTableKey : public HashTableKey { |
CodeCacheHashTableKey(Handle<Name> name, Handle<Code> code) |
: name_(name), flags_(code->flags()), code_(code) { } |
- bool IsMatch(Object* other) V8_OVERRIDE { |
+ bool IsMatch(Object* other) OVERRIDE { |
if (!other->IsFixedArray()) return false; |
FixedArray* pair = FixedArray::cast(other); |
Name* name = Name::cast(pair->get(0)); |
@@ -7471,16 +7471,16 @@ class CodeCacheHashTableKey : public HashTableKey { |
return name->Hash() ^ flags; |
} |
- uint32_t Hash() V8_OVERRIDE { return NameFlagsHashHelper(*name_, flags_); } |
+ uint32_t Hash() OVERRIDE { return NameFlagsHashHelper(*name_, flags_); } |
- uint32_t HashForObject(Object* obj) V8_OVERRIDE { |
+ uint32_t HashForObject(Object* obj) OVERRIDE { |
FixedArray* pair = FixedArray::cast(obj); |
Name* name = Name::cast(pair->get(0)); |
Code* code = Code::cast(pair->get(1)); |
return NameFlagsHashHelper(name, code->flags()); |
} |
- MUST_USE_RESULT Handle<Object> AsHandle(Isolate* isolate) V8_OVERRIDE { |
+ MUST_USE_RESULT Handle<Object> AsHandle(Isolate* isolate) OVERRIDE { |
Handle<Code> code = code_.ToHandleChecked(); |
Handle<FixedArray> pair = isolate->factory()->NewFixedArray(2); |
pair->set(0, *name_); |
@@ -7584,7 +7584,7 @@ class PolymorphicCodeCacheHashTableKey : public HashTableKey { |
: maps_(maps), |
code_flags_(code_flags) {} |
- bool IsMatch(Object* other) V8_OVERRIDE { |
+ bool IsMatch(Object* other) OVERRIDE { |
MapHandleList other_maps(kDefaultListAllocationSize); |
int other_flags; |
FromObject(other, &other_flags, &other_maps); |
@@ -7619,18 +7619,18 @@ class PolymorphicCodeCacheHashTableKey : public HashTableKey { |
return hash; |
} |
- uint32_t Hash() V8_OVERRIDE { |
+ uint32_t Hash() OVERRIDE { |
return MapsHashHelper(maps_, code_flags_); |
} |
- uint32_t HashForObject(Object* obj) V8_OVERRIDE { |
+ uint32_t HashForObject(Object* obj) OVERRIDE { |
MapHandleList other_maps(kDefaultListAllocationSize); |
int other_flags; |
FromObject(obj, &other_flags, &other_maps); |
return MapsHashHelper(&other_maps, other_flags); |
} |
- MUST_USE_RESULT Handle<Object> AsHandle(Isolate* isolate) V8_OVERRIDE { |
+ MUST_USE_RESULT Handle<Object> AsHandle(Isolate* isolate) OVERRIDE { |
// The maps in |maps_| must be copied to a newly allocated FixedArray, |
// both because the referenced MapList is short-lived, and because C++ |
// objects can't be stored in the heap anyway. |
@@ -13590,7 +13590,7 @@ class StringSharedKey : public HashTableKey { |
strict_mode_(strict_mode), |
scope_position_(scope_position) { } |
- bool IsMatch(Object* other) V8_OVERRIDE { |
+ bool IsMatch(Object* other) OVERRIDE { |
DisallowHeapAllocation no_allocation; |
if (!other->IsFixedArray()) return false; |
FixedArray* other_array = FixedArray::cast(other); |
@@ -13625,12 +13625,12 @@ class StringSharedKey : public HashTableKey { |
return hash; |
} |
- uint32_t Hash() V8_OVERRIDE { |
+ uint32_t Hash() OVERRIDE { |
return StringSharedHashHelper(*source_, *shared_, strict_mode_, |
scope_position_); |
} |
- uint32_t HashForObject(Object* obj) V8_OVERRIDE { |
+ uint32_t HashForObject(Object* obj) OVERRIDE { |
DisallowHeapAllocation no_allocation; |
FixedArray* other_array = FixedArray::cast(obj); |
SharedFunctionInfo* shared = SharedFunctionInfo::cast(other_array->get(0)); |
@@ -13644,7 +13644,7 @@ class StringSharedKey : public HashTableKey { |
} |
- Handle<Object> AsHandle(Isolate* isolate) V8_OVERRIDE { |
+ Handle<Object> AsHandle(Isolate* isolate) OVERRIDE { |
Handle<FixedArray> array = isolate->factory()->NewFixedArray(4); |
array->set(0, *shared_); |
array->set(1, *source_); |
@@ -13672,22 +13672,22 @@ class RegExpKey : public HashTableKey { |
// stored value is stored where the key should be. IsMatch then |
// compares the search key to the found object, rather than comparing |
// a key to a key. |
- bool IsMatch(Object* obj) V8_OVERRIDE { |
+ bool IsMatch(Object* obj) OVERRIDE { |
FixedArray* val = FixedArray::cast(obj); |
return string_->Equals(String::cast(val->get(JSRegExp::kSourceIndex))) |
&& (flags_ == val->get(JSRegExp::kFlagsIndex)); |
} |
- uint32_t Hash() V8_OVERRIDE { return RegExpHash(*string_, flags_); } |
+ uint32_t Hash() OVERRIDE { return RegExpHash(*string_, flags_); } |
- Handle<Object> AsHandle(Isolate* isolate) V8_OVERRIDE { |
+ Handle<Object> AsHandle(Isolate* isolate) OVERRIDE { |
// Plain hash maps, which is where regexp keys are used, don't |
// use this function. |
UNREACHABLE(); |
return MaybeHandle<Object>().ToHandleChecked(); |
} |
- uint32_t HashForObject(Object* obj) V8_OVERRIDE { |
+ uint32_t HashForObject(Object* obj) OVERRIDE { |
FixedArray* val = FixedArray::cast(obj); |
return RegExpHash(String::cast(val->get(JSRegExp::kSourceIndex)), |
Smi::cast(val->get(JSRegExp::kFlagsIndex))); |
@@ -13733,17 +13733,17 @@ class InternalizedStringKey : public HashTableKey { |
explicit InternalizedStringKey(Handle<String> string) |
: string_(string) { } |
- virtual bool IsMatch(Object* string) V8_OVERRIDE { |
+ virtual bool IsMatch(Object* string) OVERRIDE { |
return String::cast(string)->Equals(*string_); |
} |
- virtual uint32_t Hash() V8_OVERRIDE { return string_->Hash(); } |
+ virtual uint32_t Hash() OVERRIDE { return string_->Hash(); } |
- virtual uint32_t HashForObject(Object* other) V8_OVERRIDE { |
+ virtual uint32_t HashForObject(Object* other) OVERRIDE { |
return String::cast(other)->Hash(); |
} |
- virtual Handle<Object> AsHandle(Isolate* isolate) V8_OVERRIDE { |
+ virtual Handle<Object> AsHandle(Isolate* isolate) OVERRIDE { |
// Internalize the string if possible. |
MaybeHandle<Map> maybe_map = |
isolate->factory()->InternalizedStringMapForString(string_); |
@@ -14660,7 +14660,7 @@ class TwoCharHashTableKey : public HashTableKey { |
#endif |
} |
- bool IsMatch(Object* o) V8_OVERRIDE { |
+ bool IsMatch(Object* o) OVERRIDE { |
if (!o->IsString()) return false; |
String* other = String::cast(o); |
if (other->length() != 2) return false; |
@@ -14668,13 +14668,13 @@ class TwoCharHashTableKey : public HashTableKey { |
return other->Get(1) == c2_; |
} |
- uint32_t Hash() V8_OVERRIDE { return hash_; } |
- uint32_t HashForObject(Object* key) V8_OVERRIDE { |
+ uint32_t Hash() OVERRIDE { return hash_; } |
+ uint32_t HashForObject(Object* key) OVERRIDE { |
if (!key->IsString()) return 0; |
return String::cast(key)->Hash(); |
} |
- Handle<Object> AsHandle(Isolate* isolate) V8_OVERRIDE { |
+ Handle<Object> AsHandle(Isolate* isolate) OVERRIDE { |
// The TwoCharHashTableKey is only used for looking in the string |
// table, not for adding to it. |
UNREACHABLE(); |
@@ -14872,7 +14872,7 @@ class StringsKey : public HashTableKey { |
public: |
explicit StringsKey(Handle<FixedArray> strings) : strings_(strings) { } |
- bool IsMatch(Object* strings) V8_OVERRIDE { |
+ bool IsMatch(Object* strings) OVERRIDE { |
FixedArray* o = FixedArray::cast(strings); |
int len = strings_->length(); |
if (o->length() != len) return false; |
@@ -14882,9 +14882,9 @@ class StringsKey : public HashTableKey { |
return true; |
} |
- uint32_t Hash() V8_OVERRIDE { return HashForObject(*strings_); } |
+ uint32_t Hash() OVERRIDE { return HashForObject(*strings_); } |
- uint32_t HashForObject(Object* obj) V8_OVERRIDE { |
+ uint32_t HashForObject(Object* obj) OVERRIDE { |
FixedArray* strings = FixedArray::cast(obj); |
int len = strings->length(); |
uint32_t hash = 0; |
@@ -14894,7 +14894,7 @@ class StringsKey : public HashTableKey { |
return hash; |
} |
- Handle<Object> AsHandle(Isolate* isolate) V8_OVERRIDE { return strings_; } |
+ Handle<Object> AsHandle(Isolate* isolate) OVERRIDE { return strings_; } |
private: |
Handle<FixedArray> strings_; |