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

Timestamp:

Oct 23, 2007, 12:00:37 AM (18 years ago)

Author:

darin

Message:

Reviewed by Eric.

• streamline exception handling code for a >1% speed-up of SunSpider

• kjs/nodes.cpp: Changed macros to use functions for everything that's not part of normal execution. We'll take function call overhead when propagating an exception or out of memory. (KJS::createOutOfMemoryCompletion): Added. (KJS::substitute): Use append instead of the relatively inefficient + operator. (KJS::Node::rethrowException): Added.
• kjs/nodes.h: Added rethrowException.

File:

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

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -1 +1 @@
 /*
- *  This file is part of the KDE libraries
  *  Copyright (C) 1999-2002 Harri Porten ([email protected])
  *  Copyright (C) 2001 Peter Kelly ([email protected])
@@ -26 +25 @@
 #include "nodes.h"
 
-#include <math.h>
-#ifdef KJS_DEBUG_MEM
-#include <stdio.h>
-#include <typeinfo>
-#endif
-
+#include "PropertyNameArray.h"
 #include "context.h"
 #include "debugger.h"
@@ -37 +31 @@
 #include "lexer.h"
 #include "operations.h"
-#include "PropertyNameArray.h"
+#include <math.h>
 #include <wtf/Assertions.h>
+#include <wtf/HashCountedSet.h>
 #include <wtf/HashSet.h>
-#include <wtf/HashCountedSet.h>
 #include <wtf/MathExtras.h>
 
-using namespace KJS;
+namespace KJS {
 
 #define KJS_BREAKPOINT \
@@ -49 +43 @@
     return Completion(Normal);
 
-#define KJS_ABORTPOINT \
-  if (Debugger::debuggersPresent > 0 && \
-      exec->dynamicInterpreter()->imp()->debugger() && \
-      exec->dynamicInterpreter()->imp()->debugger()->imp()->aborted()) \
-    return Completion(Normal);
-
 #define KJS_CHECKEXCEPTION \
-  if (exec->hadException()) { \
-    JSValue *ex = exec->exception(); \
-    exec->clearException(); \
-    handleException(exec, ex); \
-    return Completion(Throw, ex); \
-  } \
+  if (exec->hadException()) \
+    return rethrowException(exec); \
   if (Collector::isOutOfMemory()) \
-    return Completion(Throw, Error::create(exec, GeneralError, "Out of memory"));
+    return createOutOfMemoryCompletion(exec);
 
 #define KJS_CHECKEXCEPTIONVALUE \
@@ -80 +64 @@
   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 -----------------------------------------
@@ -193 +182 @@
     int position = string.find("%s");
     ASSERT(position != -1);
-    string = string.substr(0, position) + substring + string.substr(position + 2);
+    UString newString = string.substr(0, position);
+    newString.append(substring);
+    newString.append(string.substr(position + 2));
+    string = newString;
 }
 
@@ -299 +291 @@
             dbg->imp()->abort();
     }
+}
+
+Completion Node::rethrowException(ExecState* exec)
+{
+    JSValue* exception = exec->exception();
+    exec->clearException();
+    handleException(exec, exception);
+    return Completion(Throw, exception);
 }
 
@@ -2616 +2616 @@
 {
 }
+
+}