Changeset 103157 in webkit for trunk/Source/JavaScriptCore/API

Timestamp:

Dec 17, 2011, 3:17:26 PM (13 years ago)

Author:

[email protected]

Message:

OpaqueJSClass: Remove RVCT2 workarounds.
<​http://webkit.org/b/74250>

Reviewed by Benjamin Poulain.

We no longer need workarounds for the RVCT2 compiler since it was
only used for the Symbian port of WebKit which is now defunct.

• API/JSClassRef.cpp:

(OpaqueJSClass::OpaqueJSClass):
(OpaqueJSClassContextData::OpaqueJSClassContextData):

File:

• trunk/Source/JavaScriptCore/API/JSClassRef.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/API/JSClassRef.cpp

@@ -79 +79 @@
         while (staticValue->name) {
             UString valueName = tryCreateStringFromUTF8(staticValue->name);
-            if (!valueName.isNull()) {
-                // Use a local variable here to sidestep an RVCT compiler bug.
-                OwnPtr<StaticValueEntry> entry = adoptPtr(new StaticValueEntry(staticValue->getProperty, staticValue->setProperty, staticValue->attributes));
-                m_staticValues->set(valueName.impl(), entry.release());
-            }
+            if (!valueName.isNull())
+                m_staticValues->set(valueName.impl(), adoptPtr(new StaticValueEntry(staticValue->getProperty, staticValue->setProperty, staticValue->attributes)));
             ++staticValue;
         }
@@ -92 +89 @@
         while (staticFunction->name) {
             UString functionName = tryCreateStringFromUTF8(staticFunction->name);
-            if (!functionName.isNull()) {
-                // Use a local variable here to sidestep an RVCT compiler bug.
-                OwnPtr<StaticFunctionEntry> entry = adoptPtr(new StaticFunctionEntry(staticFunction->callAsFunction, staticFunction->attributes));
-                m_staticFunctions->set(functionName.impl(), entry.release());
-            }
+            if (!functionName.isNull())
+                m_staticFunctions->set(functionName.impl(), adoptPtr(new StaticFunctionEntry(staticFunction->callAsFunction, staticFunction->attributes)));
             ++staticFunction;
         }
@@ -155 +149 @@
         for (OpaqueJSClassStaticValuesTable::const_iterator it = jsClass->m_staticValues->begin(); it != end; ++it) {
             ASSERT(!it->first->isIdentifier());
-            // Use a local variable here to sidestep an RVCT compiler bug.
-            OwnPtr<StaticValueEntry> entry = adoptPtr(new StaticValueEntry(it->second->getProperty, it->second->setProperty, it->second->attributes));
-            staticValues->add(StringImpl::create(it->first->characters(), it->first->length()), entry.release());
+            staticValues->add(StringImpl::create(it->first->characters(), it->first->length()), adoptPtr(new StaticValueEntry(it->second->getProperty, it->second->setProperty, it->second->attributes)));
         }
     }
@@ -166 +158 @@
         for (OpaqueJSClassStaticFunctionsTable::const_iterator it = jsClass->m_staticFunctions->begin(); it != end; ++it) {
             ASSERT(!it->first->isIdentifier());
-            // Use a local variable here to sidestep an RVCT compiler bug.
-            OwnPtr<StaticFunctionEntry> entry = adoptPtr(new StaticFunctionEntry(it->second->callAsFunction, it->second->attributes));
-            staticFunctions->add(StringImpl::create(it->first->characters(), it->first->length()), entry.release());
+            staticFunctions->add(StringImpl::create(it->first->characters(), it->first->length()), adoptPtr(new StaticFunctionEntry(it->second->callAsFunction, it->second->attributes)));
         }
     }