Changeset 35776 in webkit for trunk/JavaScriptCore

Timestamp:

Aug 15, 2008, 1:32:01 AM (17 years ago)

Author:

[email protected]

Message:

Build fix.

• JavaScriptCore.xcodeproj/project.pbxproj: Marked OpaqueJSString as private

• kjs/identifier.cpp: (KJS::Identifier::checkSameIdentifierTable):
• kjs/identifier.h: (KJS::Identifier::add): Since checkSameIdentifierTable is exported for debug build's sake, gcc wants it to be non-inline in release builds, too.

• JavaScriptCore.exp: Don't export inline OpaqueJSString destructor.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• JavaScriptCore.exp (modified) (1 diff)
• JavaScriptCore.xcodeproj/project.pbxproj (modified) (1 diff)
• kjs/identifier.cpp (modified) (1 diff)
• kjs/identifier.h (modified) (3 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-08-15  Alexey Proskuryakov  <[email protected]>
+
+        Build fix.
+
+        * JavaScriptCore.xcodeproj/project.pbxproj: Marked OpaqueJSString as private
+
+        * kjs/identifier.cpp:
+        (KJS::Identifier::checkSameIdentifierTable):
+        * kjs/identifier.h:
+        (KJS::Identifier::add):
+        Since checkSameIdentifierTable is exported for debug build's sake, gcc wants it to be
+        non-inline in release builds, too.
+
+        * JavaScriptCore.exp: Don't export inline OpaqueJSString destructor.
+
 2008-08-15  Alexey Proskuryakov  <[email protected]>
 

trunk/JavaScriptCore/JavaScriptCore.exp

@@ -77 +77 @@
 __Z15jsRegExpCompilePKti24JSRegExpIgnoreCaseOption23JSRegExpMultilineOptionPjPPKc
 __Z15jsRegExpExecutePK8JSRegExpPKtiiPii
-__ZN14OpaqueJSStringD1Ev
 __ZN3KJS10Identifier11addSlowCaseEPNS_12JSGlobalDataEPNS_7UString3RepE
 __ZN3KJS10Identifier11addSlowCaseEPNS_9ExecStateEPNS_7UString3RepE

trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -275 +275 @@
                 BCF605140E203EF800B9A64D /* ArgList.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF605120E203EF800B9A64D /* ArgList.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 C0A272630E50A06300E96E15 /* NotFound.h in Headers */ = {isa = PBXBuildFile; fileRef = C0A2723F0E509F1E00E96E15 /* NotFound.h */; settings = {ATTRIBUTES = (Private, ); }; };
-                E124A8F70E555775003091F1 /* OpaqueJSString.h in Headers */ = {isa = PBXBuildFile; fileRef = E124A8F50E555775003091F1 /* OpaqueJSString.h */; };
+                E124A8F70E555775003091F1 /* OpaqueJSString.h in Headers */ = {isa = PBXBuildFile; fileRef = E124A8F50E555775003091F1 /* OpaqueJSString.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 E124A8F80E555775003091F1 /* OpaqueJSString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E124A8F60E555775003091F1 /* OpaqueJSString.cpp */; };
                 E178636D0D9BEEC300D74E75 /* InitializeThreading.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E178636C0D9BEEC300D74E75 /* InitializeThreading.cpp */; };

trunk/JavaScriptCore/kjs/identifier.cpp

@@ -234 +234 @@
     ASSERT(rep->identifierTable() == globalData->identifierTable);
 }
-
+#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;
             }
@@ -129 +133 @@
     }
 
-#ifdef NDEBUG
-    void UString::checkSameIdentifierTable(ExecState*, UString::Rep*) {}
-    void UString::checkSameIdentifierTable(JSGlobalData*, UString::Rep*) {}
-#endif
-
     IdentifierTable* createIdentifierTable();
     void deleteIdentifierTable(IdentifierTable*);