Changeset 9781 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Jul 14, 2005, 3:32:17 PM (20 years ago)

Author:

ggaren

Message:

• fixed ​http://bugzilla.opendarwin.org/show_bug.cgi?id=4006 testkjs doesn't implement gc()

• test failure: ecma_3/Function/regress-104584.js

Reviewed by mjs.

• kjs/interpreter.cpp: (Interpreter::finalCheck): removed misleading while && comment

• kjs/testkjs.cpp: added "gc" function to global object (TestFunctionImp::): (TestFunctionImp::call): (main):

• tests/mozilla/expected.html:

Location:

trunk/JavaScriptCore/kjs

Files:

• interpreter.cpp (modified) (1 diff)
• testkjs.cpp (modified) (4 diffs)

trunk/JavaScriptCore/kjs/interpreter.cpp

@@ -311 +311 @@
 {
   fprintf(stderr,"Interpreter::finalCheck()\n");
-  // Garbage collect - as many times as necessary
-  // (we could delete an object which was holding another object, so
-  // the deref() will happen too late for deleting the impl of the 2nd object).
-  while( Collector::collect() )
-    ;
+  Collector::collect();
 
   Node::finalCheck();

trunk/JavaScriptCore/kjs/testkjs.cpp

@@ -30 +30 @@
 #include "types.h"
 #include "interpreter.h"
+#include "collector.h"
 
 using namespace KJS;
@@ -39 +40 @@
   virtual Value call(ExecState *exec, Object &thisObj, const List &args);
 
-  enum { Print, Debug, Quit };
+  enum { Print, Debug, Quit, GC };
 
 private:
@@ -60 +61 @@
     exit(0);
     return Undefined();
+  case GC:
+    Interpreter::lock();
+    Collector::collect();
+    Interpreter::unlock();
+    break;
   default:
     break;
@@ -108 +114 @@
     // add "quit" for compatibility with the mozilla js shell
     global.put(interp.globalExec(), "quit", Object(new TestFunctionImp(TestFunctionImp::Quit,0)));
+    // add "gc" for compatibility with the mozilla js shell
+    global.put(interp.globalExec(), "gc", Object(new TestFunctionImp(TestFunctionImp::GC,0)));
     // add "version" for compatibility with the mozilla js shell 
     global.put(interp.globalExec(), "version", Object(new VersionFunctionImp()));