Skip to content

V
V8
Commit fd2d480f authored by ulan@chromium.org's avatar ulan@chromium.org
Browse files
Options

Rename static methods to avoid shadowing virtual methods 

and fix Clang C++11 compile error.

Review URL: https://chromiumcodereview.appspot.com/9420049

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@10739 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 9e877285
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 82 deletions
build/common.gypi
View file @ fd2d480f
...@@ -306,7 +306,7 @@ ...@@ -306,7 +306,7 @@
}], }],
['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd"', { ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd"', {
'cflags': [ '-Wall', '<(werror)', '-W', '-Wno-unused-parameter', 'cflags': [ '-Wall', '<(werror)', '-W', '-Wno-unused-parameter',
'-Wnon-virtual-dtor' ], '-Wnon-virtual-dtor', '-Woverloaded-virtual' ],
}], }],
], ],
}, # Debug }, # Debug
......
src/elements.cc
View file @ fd2d480f
...@@ -109,30 +109,29 @@ class ElementsAccessorBase : public ElementsAccessor { ...@@ -109,30 +109,29 @@ class ElementsAccessorBase : public ElementsAccessor {
uint32_t key, uint32_t key,
JSObject* obj, JSObject* obj,
Object* receiver) { Object* receiver) {
return ElementsAccessorSubclass::Get( return ElementsAccessorSubclass::GetImpl(
BackingStoreClass::cast(backing_store), key, obj, receiver); BackingStoreClass::cast(backing_store), key, obj, receiver);
} }
static MaybeObject* Get(BackingStoreClass* backing_store, static MaybeObject* GetImpl(BackingStoreClass* backing_store,
uint32_t key, uint32_t key,
JSObject* obj, JSObject* obj,
Object* receiver) { Object* receiver) {
if (key < ElementsAccessorSubclass::GetCapacity(backing_store)) { return (key < ElementsAccessorSubclass::GetCapacityImpl(backing_store))
return backing_store->get(key); ? backing_store->get(key)
} : backing_store->GetHeap()->the_hole_value();
return backing_store->GetHeap()->the_hole_value();
} }
virtual MaybeObject* SetLength(JSObject* obj, virtual MaybeObject* SetLength(JSObject* obj,
Object* length) { Object* length) {
ASSERT(obj->IsJSArray()); ASSERT(obj->IsJSArray());
return ElementsAccessorSubclass::SetLength( return ElementsAccessorSubclass::SetLengthImpl(
BackingStoreClass::cast(obj->elements()), obj, length); BackingStoreClass::cast(obj->elements()), obj, length);
} }
static MaybeObject* SetLength(BackingStoreClass* backing_store, static MaybeObject* SetLengthImpl(BackingStoreClass* backing_store,
JSObject* obj, JSObject* obj,
Object* length); Object* length);
virtual MaybeObject* SetCapacityAndLength(JSArray* array, virtual MaybeObject* SetCapacityAndLength(JSArray* array,
int capacity, int capacity,
...@@ -167,7 +166,7 @@ class ElementsAccessorBase : public ElementsAccessor { ...@@ -167,7 +166,7 @@ class ElementsAccessorBase : public ElementsAccessor {
} }
#endif #endif
BackingStoreClass* backing_store = BackingStoreClass::cast(from); BackingStoreClass* backing_store = BackingStoreClass::cast(from);
uint32_t len1 = ElementsAccessorSubclass::GetCapacity(backing_store); uint32_t len1 = ElementsAccessorSubclass::GetCapacityImpl(backing_store);
// Optimize if 'other' is empty. // Optimize if 'other' is empty.
// We cannot optimize if 'this' is empty, as other may have holes. // We cannot optimize if 'this' is empty, as other may have holes.
...@@ -176,14 +175,13 @@ class ElementsAccessorBase : public ElementsAccessor { ...@@ -176,14 +175,13 @@ class ElementsAccessorBase : public ElementsAccessor {
// Compute how many elements are not in other. // Compute how many elements are not in other.
int extra = 0; int extra = 0;
for (uint32_t y = 0; y < len1; y++) { for (uint32_t y = 0; y < len1; y++) {
if (ElementsAccessorSubclass::HasElementAtIndex(backing_store, if (ElementsAccessorSubclass::HasElementAtIndexImpl(
y, backing_store, y, holder, receiver)) {
holder,
receiver)) {
uint32_t key = uint32_t key =
ElementsAccessorSubclass::GetKeyForIndex(backing_store, y); ElementsAccessorSubclass::GetKeyForIndexImpl(backing_store, y);
MaybeObject* maybe_value = MaybeObject* maybe_value =
ElementsAccessorSubclass::Get(backing_store, key, holder, receiver); ElementsAccessorSubclass::GetImpl(backing_store, key,
holder, receiver);
Object* value; Object* value;
if (!maybe_value->ToObject(&value)) return maybe_value; if (!maybe_value->ToObject(&value)) return maybe_value;
ASSERT(!value->IsTheHole()); ASSERT(!value->IsTheHole());
...@@ -214,14 +212,13 @@ class ElementsAccessorBase : public ElementsAccessor { ...@@ -214,14 +212,13 @@ class ElementsAccessorBase : public ElementsAccessor {
// Fill in the extra values. // Fill in the extra values.
int index = 0; int index = 0;
for (uint32_t y = 0; y < len1; y++) { for (uint32_t y = 0; y < len1; y++) {
if (ElementsAccessorSubclass::HasElementAtIndex(backing_store, if (ElementsAccessorSubclass::HasElementAtIndexImpl(
y, backing_store, y, holder, receiver)) {
holder,
receiver)) {
uint32_t key = uint32_t key =
ElementsAccessorSubclass::GetKeyForIndex(backing_store, y); ElementsAccessorSubclass::GetKeyForIndexImpl(backing_store, y);
MaybeObject* maybe_value = MaybeObject* maybe_value =
ElementsAccessorSubclass::Get(backing_store, key, holder, receiver); ElementsAccessorSubclass::GetImpl(backing_store, key,
holder, receiver);
Object* value; Object* value;
if (!maybe_value->ToObject(&value)) return maybe_value; if (!maybe_value->ToObject(&value)) return maybe_value;
if (!value->IsTheHole() && !HasKey(to, value)) { if (!value->IsTheHole() && !HasKey(to, value)) {
...@@ -235,25 +232,23 @@ class ElementsAccessorBase : public ElementsAccessor { ...@@ -235,25 +232,23 @@ class ElementsAccessorBase : public ElementsAccessor {
} }
protected: protected:
static uint32_t GetCapacity(BackingStoreClass* backing_store) { static uint32_t GetCapacityImpl(BackingStoreClass* backing_store) {
return backing_store->length(); return backing_store->length();
} }
virtual uint32_t GetCapacity(FixedArrayBase* backing_store) { virtual uint32_t GetCapacity(FixedArrayBase* backing_store) {
return ElementsAccessorSubclass::GetCapacity( return ElementsAccessorSubclass::GetCapacityImpl(
BackingStoreClass::cast(backing_store)); BackingStoreClass::cast(backing_store));
} }
static bool HasElementAtIndex(BackingStoreClass* backing_store, static bool HasElementAtIndexImpl(BackingStoreClass* backing_store,
uint32_t index, uint32_t index,
JSObject* holder, JSObject* holder,
Object* receiver) { Object* receiver) {
uint32_t key = uint32_t key =
ElementsAccessorSubclass::GetKeyForIndex(backing_store, index); ElementsAccessorSubclass::GetKeyForIndexImpl(backing_store, index);
MaybeObject* element = ElementsAccessorSubclass::Get(backing_store, MaybeObject* element =
key, ElementsAccessorSubclass::GetImpl(backing_store, key, holder, receiver);
holder,
receiver);
return !element->IsTheHole(); return !element->IsTheHole();
} }
...@@ -261,18 +256,18 @@ class ElementsAccessorBase : public ElementsAccessor { ...@@ -261,18 +256,18 @@ class ElementsAccessorBase : public ElementsAccessor {
uint32_t index, uint32_t index,
JSObject* holder, JSObject* holder,
Object* receiver) { Object* receiver) {
return ElementsAccessorSubclass::HasElementAtIndex( return ElementsAccessorSubclass::HasElementAtIndexImpl(
BackingStoreClass::cast(backing_store), index, holder, receiver); BackingStoreClass::cast(backing_store), index, holder, receiver);
} }
static uint32_t GetKeyForIndex(BackingStoreClass* backing_store, static uint32_t GetKeyForIndexImpl(BackingStoreClass* backing_store,
uint32_t index) { uint32_t index) {
return index; return index;
} }
virtual uint32_t GetKeyForIndex(FixedArrayBase* backing_store, virtual uint32_t GetKeyForIndex(FixedArrayBase* backing_store,
uint32_t index) { uint32_t index) {
return ElementsAccessorSubclass::GetKeyForIndex( return ElementsAccessorSubclass::GetKeyForIndexImpl(
BackingStoreClass::cast(backing_store), index); BackingStoreClass::cast(backing_store), index);
} }
...@@ -446,10 +441,10 @@ class FastDoubleElementsAccessor ...@@ -446,10 +441,10 @@ class FastDoubleElementsAccessor
return obj->GetHeap()->true_value(); return obj->GetHeap()->true_value();
} }
static bool HasElementAtIndex(FixedDoubleArray* backing_store, static bool HasElementAtIndexImpl(FixedDoubleArray* backing_store,
uint32_t index, uint32_t index,
JSObject* holder, JSObject* holder,
Object* receiver) { Object* receiver) {
return !backing_store->is_the_hole(index); return !backing_store->is_the_hole(index);
} }
}; };
...@@ -465,20 +460,19 @@ class ExternalElementsAccessor ...@@ -465,20 +460,19 @@ class ExternalElementsAccessor
friend class ElementsAccessorBase<ExternalElementsAccessorSubclass, friend class ElementsAccessorBase<ExternalElementsAccessorSubclass,
ExternalArray>; ExternalArray>;
static MaybeObject* Get(ExternalArray* backing_store, static MaybeObject* GetImpl(ExternalArray* backing_store,
uint32_t key, uint32_t key,
JSObject* obj, JSObject* obj,
Object* receiver) { Object* receiver) {
if (key < ExternalElementsAccessorSubclass::GetCapacity(backing_store)) { return
return backing_store->get(key); key < ExternalElementsAccessorSubclass::GetCapacityImpl(backing_store)
} else { ? backing_store->get(key)
return backing_store->GetHeap()->undefined_value(); : backing_store->GetHeap()->undefined_value();
}
} }
static MaybeObject* SetLength(ExternalArray* backing_store, static MaybeObject* SetLengthImpl(ExternalArray* backing_store,
JSObject* obj, JSObject* obj,
Object* length) { Object* length) {
// External arrays do not support changing their length. // External arrays do not support changing their length.
UNREACHABLE(); UNREACHABLE();
return obj; return obj;
...@@ -663,10 +657,10 @@ class DictionaryElementsAccessor ...@@ -663,10 +657,10 @@ class DictionaryElementsAccessor
return DeleteCommon(obj, key, mode); return DeleteCommon(obj, key, mode);
} }
static MaybeObject* Get(SeededNumberDictionary* backing_store, static MaybeObject* GetImpl(SeededNumberDictionary* backing_store,
uint32_t key, uint32_t key,
JSObject* obj, JSObject* obj,
Object* receiver) { Object* receiver) {
int entry = backing_store->FindEntry(key); int entry = backing_store->FindEntry(key);
if (entry != SeededNumberDictionary::kNotFound) { if (entry != SeededNumberDictionary::kNotFound) {
Object* element = backing_store->ValueAt(entry); Object* element = backing_store->ValueAt(entry);
...@@ -683,8 +677,8 @@ class DictionaryElementsAccessor ...@@ -683,8 +677,8 @@ class DictionaryElementsAccessor
return obj->GetHeap()->the_hole_value(); return obj->GetHeap()->the_hole_value();
} }
static uint32_t GetKeyForIndex(SeededNumberDictionary* dict, static uint32_t GetKeyForIndexImpl(SeededNumberDictionary* dict,
uint32_t index) { uint32_t index) {
Object* key = dict->KeyAt(index); Object* key = dict->KeyAt(index);
return Smi::cast(key)->value(); return Smi::cast(key)->value();
} }
...@@ -698,10 +692,10 @@ class NonStrictArgumentsElementsAccessor ...@@ -698,10 +692,10 @@ class NonStrictArgumentsElementsAccessor
friend class ElementsAccessorBase<NonStrictArgumentsElementsAccessor, friend class ElementsAccessorBase<NonStrictArgumentsElementsAccessor,
FixedArray>; FixedArray>;
static MaybeObject* Get(FixedArray* parameter_map, static MaybeObject* GetImpl(FixedArray* parameter_map,
uint32_t key, uint32_t key,
JSObject* obj, JSObject* obj,
Object* receiver) { Object* receiver) {
Object* probe = GetParameterMapArg(parameter_map, key); Object* probe = GetParameterMapArg(parameter_map, key);
if (!probe->IsTheHole()) { if (!probe->IsTheHole()) {
Context* context = Context::cast(parameter_map->get(0)); Context* context = Context::cast(parameter_map->get(0));
...@@ -718,9 +712,9 @@ class NonStrictArgumentsElementsAccessor ...@@ -718,9 +712,9 @@ class NonStrictArgumentsElementsAccessor
} }
} }
static MaybeObject* SetLength(FixedArray* parameter_map, static MaybeObject* SetLengthImpl(FixedArray* parameter_map,
JSObject* obj, JSObject* obj,
Object* length) { Object* length) {
// TODO(mstarzinger): This was never implemented but will be used once we // TODO(mstarzinger): This was never implemented but will be used once we
// correctly implement [[DefineOwnProperty]] on arrays. // correctly implement [[DefineOwnProperty]] on arrays.
UNIMPLEMENTED(); UNIMPLEMENTED();
...@@ -748,21 +742,21 @@ class NonStrictArgumentsElementsAccessor ...@@ -748,21 +742,21 @@ class NonStrictArgumentsElementsAccessor
return obj->GetHeap()->true_value(); return obj->GetHeap()->true_value();
} }
static uint32_t GetCapacity(FixedArray* parameter_map) { static uint32_t GetCapacityImpl(FixedArray* parameter_map) {
FixedArrayBase* arguments = FixedArrayBase::cast(parameter_map->get(1)); FixedArrayBase* arguments = FixedArrayBase::cast(parameter_map->get(1));
return Max(static_cast<uint32_t>(parameter_map->length() - 2), return Max(static_cast<uint32_t>(parameter_map->length() - 2),
ForArray(arguments)->GetCapacity(arguments)); ForArray(arguments)->GetCapacity(arguments));
} }
static uint32_t GetKeyForIndex(FixedArray* dict, static uint32_t GetKeyForIndexImpl(FixedArray* dict,
uint32_t index) { uint32_t index) {
return index; return index;
} }
static bool HasElementAtIndex(FixedArray* parameter_map, static bool HasElementAtIndexImpl(FixedArray* parameter_map,
uint32_t index, uint32_t index,
JSObject* holder, JSObject* holder,
Object* receiver) { Object* receiver) {
Object* probe = GetParameterMapArg(parameter_map, index); Object* probe = GetParameterMapArg(parameter_map, index);
if (!probe->IsTheHole()) { if (!probe->IsTheHole()) {
return true; return true;
...@@ -866,9 +860,9 @@ void ElementsAccessor::InitializeOncePerProcess() { ...@@ -866,9 +860,9 @@ void ElementsAccessor::InitializeOncePerProcess() {
template <typename ElementsAccessorSubclass, typename BackingStoreClass> template <typename ElementsAccessorSubclass, typename BackingStoreClass>
MaybeObject* ElementsAccessorBase<ElementsAccessorSubclass, BackingStoreClass>:: MaybeObject* ElementsAccessorBase<ElementsAccessorSubclass, BackingStoreClass>::
SetLength(BackingStoreClass* backing_store, SetLengthImpl(BackingStoreClass* backing_store,
JSObject* obj, JSObject* obj,
Object* length) { Object* length) {
JSArray* array = JSArray::cast(obj); JSArray* array = JSArray::cast(obj);
// Fast case: The new length fits into a Smi. // Fast case: The new length fits into a Smi.
......
src/objects.h
View file @ fd2d480f
...@@ -1011,7 +1011,7 @@ class Smi: public Object { ...@@ -1011,7 +1011,7 @@ class Smi: public Object {
void SmiVerify(); void SmiVerify();
#endif #endif
static const int kMinValue = (-1 << (kSmiValueSize - 1)); static const int kMinValue = (-1U << (kSmiValueSize - 1));
static const int kMaxValue = -(kMinValue + 1); static const int kMaxValue = -(kMinValue + 1);
private: private:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment