Changeset 104744 in webkit

Timestamp:

Jan 11, 2012 2:01:29 PM (12 years ago)

Author:

andersca@apple.com

Message:

Assertion failure in JSC::allocateCell trying to allocate a JSString
​https://bugs.webkit.org/show_bug.cgi?id=76101

Reviewed by Adam Roben.

Remove the ExecutableBase::s_info and JSString::s_info static member variables from the .def file and
export them explicitly using the JS_EXPORTDATA macro.

member variables explicitly using

• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
• runtime/Executable.h:
• runtime/JSString.h:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def (modified) (1 diff)
• runtime/Executable.h (modified) (1 diff)
• runtime/JSString.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2012-01-11  Anders Carlsson  <andersca@apple.com>
+
+        Assertion failure in JSC::allocateCell trying to allocate a JSString
+        https://bugs.webkit.org/show_bug.cgi?id=76101
+
+        Reviewed by Adam Roben.
+
+        Remove the ExecutableBase::s_info and JSString::s_info static member variables  from the .def file and
+        export them explicitly using the JS_EXPORTDATA macro.
+
+        member variables explicitly using 
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
+        * runtime/Executable.h:
+        * runtime/JSString.h:
+
 2012-01-10  Mark Rowe  <mrowe@apple.com>
 

trunk/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def

@@ -296 +296 @@
     ?retrieveLastCaller@Interpreter@JSC@@QBEXPAVExecState@2@AAH1AAVUString@2@AAVJSValue@2@@Z
     ?s_globalObjectMethodTable@JSGlobalObject@JSC@@1UGlobalObjectMethodTable@2@B
-    ?s_info@ExecutableBase@JSC@@2UClassInfo@2@B
-    ?s_info@JSString@JSC@@2UClassInfo@2@B
     ?setConfigurable@PropertyDescriptor@JSC@@QAEX_N@Z
     ?setDescriptor@PropertyDescriptor@JSC@@QAEXVJSValue@2@I@Z

trunk/Source/JavaScriptCore/runtime/Executable.h

@@ -88 +88 @@
         static Structure* createStructure(JSGlobalData& globalData, JSGlobalObject* globalObject, JSValue proto) { return Structure::create(globalData, globalObject, proto, TypeInfo(CompoundType, StructureFlags), &s_info); }
         
-        static const ClassInfo s_info;
+        static JS_EXPORTDATA const ClassInfo s_info;
 
     protected:

trunk/Source/JavaScriptCore/runtime/JSString.h

@@ -237 +237 @@
         static size_t offsetOfValue() { return OBJECT_OFFSETOF(JSString, m_value); }
 
-        static const ClassInfo s_info;
+        static JS_EXPORTDATA const ClassInfo s_info;
 
         static void visitChildren(JSCell*, SlotVisitor&);