Changeset 36291 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Sep 9, 2008, 2:00:58 AM (17 years ago)

Author:

[email protected]

Message:

Fix builds using the "debug" variant.

Rubber-stamped by Oliver Hunt.

This reverts r36130 and tweaks Identifier to export the same symbols for Debug
and Release configurations.

• Configurations/JavaScriptCore.xcconfig:
• DerivedSources.make:
• JavaScriptCore.Debug.exp: Removed.
• JavaScriptCore.base.exp: Removed.
• JavaScriptCore.exp: Added.
• JavaScriptCore.xcodeproj/project.pbxproj:
• kjs/identifier.cpp:

(JSC::Identifier::addSlowCase): #ifdef the call to checkSameIdentifierTable so that
there is no overhead in Release builds.
(JSC::Identifier::checkSameIdentifierTable): Add empty functions for Release builds.

• kjs/identifier.h:

(JSC::Identifier::add): #ifdef the calls to checkSameIdentifierTable so that there is
no overhead in Release builds, and remove the inline definitions of checkSameIdentifierTable.

Location:

trunk/JavaScriptCore/kjs

Files:

• identifier.cpp (modified) (2 diffs)
• identifier.h (modified) (3 diffs)

trunk/JavaScriptCore/kjs/identifier.cpp

@@ -214 +214 @@
             r = globalData->smallStrings.singleCharacterStringRep(c);
             if (r->identifierTable()) {
+#ifndef NDEBUG
                 checkSameIdentifierTable(globalData, r);
+#endif
                 return r;
             }
@@ -247 +249 @@
 }
 
+#else
+
+void Identifier::checkSameIdentifierTable(ExecState*, UString::Rep*)
+{
+}
+
+void Identifier::checkSameIdentifierTable(JSGlobalData*, UString::Rep*)
+{
+}
+
 #endif
 

trunk/JavaScriptCore/kjs/identifier.h

@@ -93 +93 @@
         {
             if (r->identifierTable()) {
+#ifndef NDEBUG
                 checkSameIdentifierTable(exec, r);
+#endif
                 return r;
             }
@@ -101 +103 @@
         {
             if (r->identifierTable()) {
+#ifndef NDEBUG
                 checkSameIdentifierTable(globalData, r);
+#endif
                 return r;
             }
@@ -132 +136 @@
     void deleteIdentifierTable(IdentifierTable*);
 
-#ifdef NDEBUG
-    inline void Identifier::checkSameIdentifierTable(ExecState*, UString::Rep*) { }
-    inline void Identifier::checkSameIdentifierTable(JSGlobalData*, UString::Rep*) { }
-#endif
-
 } // namespace JSC