Changeset 27001 in webkit for trunk/JavaScriptCore/kjs/nodes.cpp

Timestamp:

Oct 24, 2007, 2:31:27 PM (18 years ago)

Author:

eseidel

Message:

2007-10-24 Eric Seidel <​[email protected]>

Reviewed by Maciej.

Stop checking isOutOfMemory after every allocation, instead let the collector
notify all ExecStates if we ever hit this rare condition.

SunSpider claims this was a 2.2% speedup.

• kjs/collector.cpp: (KJS::Collector::collect): (KJS::Collector::reportOutOfMemoryToAllInterpreters):
• kjs/collector.h:
• kjs/nodes.cpp: (KJS::TryNode::execute):

File:

• trunk/JavaScriptCore/kjs/nodes.cpp (modified) (4 diffs)

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -45 +45 @@
 #define KJS_CHECKEXCEPTION \
   if (exec->hadException()) \
-    return rethrowException(exec); \
-  if (Collector::isOutOfMemory()) \
-    return createOutOfMemoryCompletion(exec);
+    return rethrowException(exec);
 
 #define KJS_CHECKEXCEPTIONVALUE \
@@ -53 +51 @@
     handleException(exec); \
     return jsUndefined(); \
-  } \
-  if (Collector::isOutOfMemory()) \
-    return jsUndefined(); // will be picked up by KJS_CHECKEXCEPTION
+  }
 
 #define KJS_CHECKEXCEPTIONLIST \
@@ -61 +57 @@
     handleException(exec); \
     return List(); \
-  } \
-  if (Collector::isOutOfMemory()) \
-    return List(); // will be picked up by KJS_CHECKEXCEPTION
-
-static Completion createOutOfMemoryCompletion(ExecState* exec)
-{
-    return Completion(Throw, Error::create(exec, GeneralError, "Out of memory"));
-}
+  }
 
 // ------------------------------ Node -----------------------------------------
@@ -2563 +2552 @@
   Completion c = tryBlock->execute(exec);
 
+  if (Collector::isOutOfMemory())
+      return c; // don't try to catch an out of memory exception thrown by the collector
+  
   if (catchBlock && c.complType() == Throw) {
     JSObject *obj = new JSObject;