Title: [104744] trunk/Source/_javascript_Core
Revision
104744
Author
[email protected]
Date
2012-01-11 14:01:29 -0800 (Wed, 11 Jan 2012)

Log 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
* _javascript_Core.vcproj/_javascript_Core/_javascript_Core.def:
* runtime/Executable.h:
* runtime/JSString.h:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (104743 => 104744)


--- trunk/Source/_javascript_Core/ChangeLog	2012-01-11 21:52:44 UTC (rev 104743)
+++ trunk/Source/_javascript_Core/ChangeLog	2012-01-11 22:01:29 UTC (rev 104744)
@@ -1,3 +1,18 @@
+2012-01-11  Anders Carlsson  <[email protected]>
+
+        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 
+        * _javascript_Core.vcproj/_javascript_Core/_javascript_Core.def:
+        * runtime/Executable.h:
+        * runtime/JSString.h:
+
 2012-01-10  Mark Rowe  <[email protected]>
 
         <rdar://problem/10673792> jsc should install directly in to versioned Resources subfolder

Modified: trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def (104743 => 104744)


--- trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def	2012-01-11 21:52:44 UTC (rev 104743)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def	2012-01-11 22:01:29 UTC (rev 104744)
@@ -295,8 +295,6 @@
     ?retrieveCaller@Interpreter@JSC@@QBE?AVJSValue@2@PAVExecState@2@PAVJSFunction@2@@Z
     ?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
     ?setDumpsGeneratedCode@BytecodeGenerator@JSC@@SAX_N@Z

Modified: trunk/Source/_javascript_Core/runtime/Executable.h (104743 => 104744)


--- trunk/Source/_javascript_Core/runtime/Executable.h	2012-01-11 21:52:44 UTC (rev 104743)
+++ trunk/Source/_javascript_Core/runtime/Executable.h	2012-01-11 22:01:29 UTC (rev 104744)
@@ -87,7 +87,7 @@
 
         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:
         static const unsigned StructureFlags = 0;

Modified: trunk/Source/_javascript_Core/runtime/JSString.h (104743 => 104744)


--- trunk/Source/_javascript_Core/runtime/JSString.h	2012-01-11 21:52:44 UTC (rev 104743)
+++ trunk/Source/_javascript_Core/runtime/JSString.h	2012-01-11 22:01:29 UTC (rev 104744)
@@ -236,7 +236,7 @@
         static size_t offsetOfLength() { return OBJECT_OFFSETOF(JSString, m_length); }
         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&);
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to