Changeset 37759 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Oct 20, 2008, 11:08:06 PM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2008-10-20 Sam Weinig <​[email protected]>

Reviewed by Cameron Zwarich.

Fix for ​https://bugs.webkit.org/show_bug.cgi?id=21766
REGRESSION: 12 JSC tests fail

The JSGlobalObject was mutating the shared nullProtoStructureID when
used in jsc. Instead of using nullProtoStructureID, use a new StructureID.

• API/JSCallbackObject.h:
• API/JSCallbackObjectFunctions.h: (JSC::::JSCallbackObject):
• API/JSContextRef.cpp: (JSGlobalContextCreateInGroup):
• kjs/JSGlobalObject.h: (JSC::JSGlobalObject::JSGlobalObject):
• kjs/Shell.cpp: (GlobalObject::GlobalObject): (jscmain):

JavaScriptGlue:

2008-10-20 Sam Weinig <​[email protected]>

Reviewed by Cameron Zwarich.

Fix for ​https://bugs.webkit.org/show_bug.cgi?id=21766
REGRESSION: 12 JSC tests fail

The JSGlobalObject constructor no longer takes a JSGlobalData
as an argument.

• JSRun.cpp: (JSRun::JSRun):
• JSRun.h: (JSGlueGlobalObject::JSGlueGlobalObject):
• JSUtils.cpp: (getThreadGlobalExecState):

Location:

trunk/JavaScriptCore/kjs

Files:

• JSGlobalObject.h (modified) (1 diff)
• Shell.cpp (modified) (3 diffs)

trunk/JavaScriptCore/kjs/JSGlobalObject.h

@@ -142 +142 @@
         void* operator new(size_t, JSGlobalData*);
 
-        explicit JSGlobalObject(JSGlobalData* globalData)
-            : JSVariableObject(globalData->nullProtoStructureID, new JSGlobalObjectData)
+        explicit JSGlobalObject()
+            : JSVariableObject(JSGlobalObject::createStructureID(jsNull()), new JSGlobalObjectData)
         {
             init(this);

trunk/JavaScriptCore/kjs/Shell.cpp

@@ -152 +152 @@
 class GlobalObject : public JSGlobalObject {
 public:
-    GlobalObject(JSGlobalData*, const Vector<UString>& arguments);
+    GlobalObject(const Vector<UString>& arguments);
     virtual UString className() const { return "global"; }
 };
@@ -158 +158 @@
 ASSERT_CLASS_FITS_IN_CELL(GlobalObject);
 
-GlobalObject::GlobalObject(JSGlobalData* globalData, const Vector<UString>& arguments)
-    : JSGlobalObject(globalData)
+GlobalObject::GlobalObject(const Vector<UString>& arguments)
+    : JSGlobalObject()
 {
     putDirectFunction(globalExec(), new (globalExec()) PrototypeFunction(globalExec(), prototypeFunctionStructure(), 1, Identifier(globalExec(), "debug"), functionDebug));
@@ -464 +464 @@
     parseArguments(argc, argv, options);
 
-    GlobalObject* globalObject = new (globalData) GlobalObject(globalData, options.arguments);
+    GlobalObject* globalObject = new (globalData) GlobalObject(options.arguments);
     bool success = runWithScripts(globalObject, options.fileNames, options.prettyPrint, options.dump);
     if (options.interactive && success)