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

Timestamp:

Nov 13, 2008, 7:45:32 PM (17 years ago)

Author:

[email protected]

Message:

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

Reviewed by Sam Weinig.

In r38375 the 'jsc' shell was changed to improve teardown on quit. The
main() function in jsc.cpp uses Structured Exception Handling, so Visual
C++ emits a warning when destructors are used.

In order to speculatively fix the Windows build, this patch changes that
code to use explicit pointer manipulation and locking rather than smart
pointers and RAII.

• jsc.cpp: (main):

File:

• trunk/JavaScriptCore/jsc.cpp (modified) (1 diff)

trunk/JavaScriptCore/jsc.cpp

@@ -298 +298 @@
 #endif
 
+    // We can't use destructors in the following code because it uses Windows
+    // Structured Exception Handling
     int res = 0;
-    RefPtr<JSGlobalData> globalData = JSGlobalData::create();
+    JSGlobalData* globalData = JSGlobalData::create().releaseRef();
     TRY
-        res = jscmain(argc, argv, globalData.get());
+        res = jscmain(argc, argv, globalData);
     EXCEPT(res = 3)
-    {
-        JSLock lock(false);
-        globalData->heap.destroy();
-    }
+
+    JSLock::lock(false);
+    globalData->heap.destroy();
+    JSLock::unlock(false);
+
+    globalData->deref();
     return res;
 }