Changeset 38375 in webkit for trunk/JavaScriptCore/jsc.cpp

Timestamp:

Nov 13, 2008, 11:50:13 AM (17 years ago)

Author:

[email protected]

Message:

2008-11-13 Cameron Zwarich <​[email protected]>

Reviewed by Alexey Proskuryakov.

Perform teardown in the 'jsc' shell in order to suppress annoying and
misleading leak messages. There is still a lone JSC::Node leaking when
quit() is called, but hopefully that can be fixed as well.

• jsc.cpp: (functionQuit): (main):

File:

• trunk/JavaScriptCore/jsc.cpp (modified) (2 diffs)

trunk/JavaScriptCore/jsc.cpp

@@ -252 +252 @@
 }
 
-JSValue* functionQuit(ExecState*, JSObject*, JSValue*, const ArgList&)
-{
+JSValue* functionQuit(ExecState* exec, JSObject*, JSValue*, const ArgList&)
+{
+    {
+        JSLock lock(false);
+        JSGlobalData& globalData = exec->globalData();
+        globalData.heap.destroy();
+        globalData.deref();
+    }
+
     exit(0);
 #if !COMPILER(MSVC)
@@ -292 +299 @@
 
     int res = 0;
+    RefPtr<JSGlobalData> globalData = JSGlobalData::create();
     TRY
-        res = jscmain(argc, argv, JSGlobalData::create().releaseRef());
+        res = jscmain(argc, argv, globalData.get());
     EXCEPT(res = 3)
+    {
+        JSLock lock(false);
+        globalData->heap.destroy();
+    }
     return res;
 }