Changeset 84121 in webkit

Timestamp:

Apr 17, 2011 10:15:20 PM (13 years ago)

Author:

cwzwarich@webkit.org

Message:

Reviewed by Dan Bernstein.

JSC no longer builds with Clang due to -Woverloaded-virtual warning
​https://bugs.webkit.org/show_bug.cgi?id=58760

Rename Structure's specificValue overload of put to putSpecificValue to avoid
Clang's warning for overloading a virtual function.

• runtime/Structure.cpp:

(JSC::Structure::addPropertyTransition):
(JSC::Structure::addPropertyWithoutTransition):
(JSC::Structure::putSpecificValue):

• runtime/Structure.h:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/Structure.cpp (modified) (4 diffs)
• runtime/Structure.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-04-17  Cameron Zwarich  <zwarich@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        JSC no longer builds with Clang due to -Woverloaded-virtual warning
+        https://bugs.webkit.org/show_bug.cgi?id=58760
+
+        Rename Structure's specificValue overload of put to putSpecificValue to avoid
+        Clang's warning for overloading a virtual function.
+
+        * runtime/Structure.cpp:
+        (JSC::Structure::addPropertyTransition):
+        (JSC::Structure::addPropertyWithoutTransition):
+        (JSC::Structure::putSpecificValue):
+        * runtime/Structure.h:
+
 2011-04-17  Patrick Gansterer  <paroga@webkit.org>
 

trunk/Source/JavaScriptCore/runtime/Structure.cpp

@@ -337 +337 @@
         Structure* transition = toCacheableDictionaryTransition(globalData, structure);
         ASSERT(structure != transition);
-        offset = transition->put(globalData, propertyName, attributes, specificValue);
+        offset = transition->putSpecificValue(globalData, propertyName, attributes, specificValue);
         ASSERT(offset >= structure->m_anonymousSlotCount);
         ASSERT(structure->m_anonymousSlotCount == transition->m_anonymousSlotCount);
@@ -365 +365 @@
     }
 
-    offset = transition->put(globalData, propertyName, attributes, specificValue);
+    offset = transition->putSpecificValue(globalData, propertyName, attributes, specificValue);
     ASSERT(offset >= structure->m_anonymousSlotCount);
     ASSERT(structure->m_anonymousSlotCount == transition->m_anonymousSlotCount);
@@ -589 +589 @@
     m_isPinnedPropertyTable = true;
 
-    size_t offset = put(globalData, propertyName, attributes, specificValue);
+    size_t offset = putSpecificValue(globalData, propertyName, attributes, specificValue);
     ASSERT(offset >= m_anonymousSlotCount);
     if (propertyStorageSize() > propertyStorageCapacity())
@@ -684 +684 @@
 }
 
-size_t Structure::put(JSGlobalData& globalData, const Identifier& propertyName, unsigned attributes, JSCell* specificValue)
+size_t Structure::putSpecificValue(JSGlobalData& globalData, const Identifier& propertyName, unsigned attributes, JSCell* specificValue)
 {
     ASSERT(!propertyName.isNull());

trunk/Source/JavaScriptCore/runtime/Structure.h

@@ -177 +177 @@
         static Structure* toDictionaryTransition(JSGlobalData&, Structure*, DictionaryKind);
 
-        size_t put(JSGlobalData&, const Identifier& propertyName, unsigned attributes, JSCell* specificValue);
+        size_t putSpecificValue(JSGlobalData&, const Identifier& propertyName, unsigned attributes, JSCell* specificValue);
         size_t remove(const Identifier& propertyName);