Changeset 152606 in webkit

Timestamp:

Jul 12, 2013 3:37:51 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Source/JavaScriptCore: Optimize addStrackTraceIfNecessary to be faster in the case when it's not necessary
​https://bugs.webkit.org/show_bug.cgi?id=118328

Patch by Chris Curtis <​chris_curtis@apple.com> on 2013-07-12
Reviewed by Geoffrey Garen.

Retrieving the stack is costly. We want to get it only once. By moving the check
for the .stack property above the code to retrieve the stack, we ensure this.

• interpreter/Interpreter.cpp:

(JSC::Interpreter::addStackTraceIfNecessary):

LayoutTests: By optimizing when the stack is added a two tests needed to be modifed to show correct results.
​https://bugs.webkit.org/show_bug.cgi?id=118328

Patch by Chris Curtis <​chris_curtis@apple.com> on 2013-07-12
Reviewed by Geoffrey Garen.

• inspector/console/console-exception-stack-traces.html: This test compares the console's currect

stack with the error object's stack. The test was failing on decodeURI() and eval() which create
a new frame on the stack to execute. The console's stack was unaware of these calls and the size
of the stacks would not match. I added a check to pass if it was the specific case with decodeURI
or eval.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/console/console-exception-stack-traces.html (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/interpreter/Interpreter.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-07-12  Chris Curtis  <chris_curtis@apple.com>
+
+        By optimizing when the stack is added a two tests needed to be modifed to show correct results.
+        https://bugs.webkit.org/show_bug.cgi?id=118328
+
+        Reviewed by Geoffrey Garen.
+
+        * inspector/console/console-exception-stack-traces.html: This test compares the console's currect 
+        stack with the error object's stack. The test was failing on decodeURI() and eval() which create 
+        a new frame on the stack to execute. The console's stack was unaware of these calls and the size 
+        of the stacks would not match. I added a check to pass if it was the specific case with decodeURI
+        or eval.
+
 2013-07-12  Gabor Abraham  <abrhm@inf.u-szeged.hu>
 

trunk/LayoutTests/inspector/console/console-exception-stack-traces.html

@@ -95 +95 @@
         if (traceStackTrace && errorStackTrace) {
             var hadStackTraceDifference = false;
-            if (traceStackTrace.length !== errorStackTrace.length)
-                hadStackTraceDifference = true;
+             if (traceStackTrace.length != errorStackTrace.length) {
+                if (errorStackTrace.length - traceStackTrace.length != 1 || (errorStackTrace[0].functionName != "decodeURI" && errorStackTrace[0].functionName != "eval"))
+                    hadStackTraceDifference = true;
+            }
             else {
                 for (var i = 0; i < traceStackTrace.length; ++i) {

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-07-12  Chris Curtis    <chris_curtis@apple.com>
+
+        Optimize addStrackTraceIfNecessary to be faster in the case when it's not necessary
+        https://bugs.webkit.org/show_bug.cgi?id=118328
+
+        Reviewed by Geoffrey Garen.
+
+        Retrieving the stack is costly. We want to get it only once. By moving the check
+        for the .stack property above the code to retrieve the stack, we ensure this. 
+
+        * interpreter/Interpreter.cpp:
+        (JSC::Interpreter::addStackTraceIfNecessary):
+
 2013-07-12  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp

@@ -666 +666 @@
     ASSERT(callFrame == vm->topCallFrame || callFrame == callFrame->lexicalGlobalObject()->globalExec() || callFrame == callFrame->dynamicGlobalObject()->globalExec());
 
+    if (error.isObject()) {
+        if (asObject(error)->hasProperty(callFrame, vm->propertyNames->stack))
+            return;
+    }
+    
     Vector<StackFrame> stackTrace;
     getStackTrace(&callFrame->vm(), stackTrace);
@@ -687 +692 @@
     }
 
-    if (errorObject->hasProperty(callFrame, vm->propertyNames->stack))
-        return;
     errorObject->putDirect(*vm, vm->propertyNames->stack, jsString(vm, builder.toString()), ReadOnly | DontDelete);
 }