2008-06-24 Cameron Zwarich <cwzwarich@uwaterloo.ca>

        Reviewed by Alexey Proskuryakov.

        Make the JavaScript shell collect the heap from main() instead of
        jscmain() to suppress leak messages in debug builds.

        * kjs/Shell.cpp:
        (main):
        (jscmain):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@34790 268f45cc-cd09-0410-ab3c-d52691b4dbfc

JavaScriptCore/ChangeLog

+2008-06-24  Cameron Zwarich  <cwzwarich@uwaterloo.ca>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Make the JavaScript shell collect the heap from main() instead of
+        jscmain() to suppress leak messages in debug builds.
+
+        * kjs/Shell.cpp:
+        (main):
+        (jscmain):
+
 2008-06-24  Cameron Zwarich  <cwzwarich@uwaterloo.ca>
 
         Reviewed by Maciej.

JavaScriptCore/kjs/Shell.cpp

@@ -297,6 +297,10 @@ int main(int argc, char** argv)
     int res = 0;
     TRY
         res = jscmain(argc, argv);
+#ifndef NDEBUG
+        JSLock lock;
+        JSGlobalData::threadInstance().heap->collect();
+#endif
     EXCEPT(res = 3)
     return res;
 }
@@ -451,10 +455,6 @@ int jscmain(int argc, char** argv)
     if (options.interactive && success)
         runInteractive(globalObject);
 
-#ifndef NDEBUG
-    globalObject->globalData()->heap->collect();
-#endif
-
     return success ? 0 : 3;
 }