Changeset 163027 in webkit for trunk/Source/JavaScriptCore/runtime/JSONObject.cpp

Timestamp:

Jan 29, 2014, 11:18:54 AM (11 years ago)

Author:

[email protected]

Message:

Merge the jsCStack branch
​https://bugs.webkit.org/show_bug.cgi?id=127763

Reviewed by Mark Hahnenberg.

Source/JavaScriptCore:

Changes from ​http://svn.webkit.org/repository/webkit/branches/jsCStack
up to changeset 162958.

Source/WebCore:

Changes from ​http://svn.webkit.org/repository/webkit/branches/jsCStack
up to changeset 162958.

Source/WTF:

Changes from ​http://svn.webkit.org/repository/webkit/branches/jsCStack
up to changeset 162958.

File:

• trunk/Source/JavaScriptCore/runtime/JSONObject.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/runtime/JSONObject.cpp

@@ -655 +655 @@
                 ASSERT(isJSArray(asObject(inValue)) || asObject(inValue)->inherits(JSArray::info()));
                 if (objectStack.size() + arrayStack.size() > maximumFilterRecursion)
-                    return m_exec->vm().throwException(m_exec, createStackOverflowError(m_exec));
+                    return throwStackOverflowError(m_exec);
 
                 JSArray* array = asArray(inValue);
@@ -706 +706 @@
                 ASSERT(!isJSArray(asObject(inValue)) && !asObject(inValue)->inherits(JSArray::info()));
                 if (objectStack.size() + arrayStack.size() > maximumFilterRecursion)
-                    return m_exec->vm().throwException(m_exec, createStackOverflowError(m_exec));
+                    return throwStackOverflowError(m_exec);
 
                 JSObject* object = asObject(inValue);