JavaScriptCore-1097.3.tar.gz

[apple/javascriptcore.git] / runtime / StringRecursionChecker.h

diff --git a/runtime/StringRecursionChecker.h b/runtime/StringRecursionChecker.h
index 314f14eeb833b77266405580e25ab196ae6f4b2e..127d028e0f542f29b9a80caa8b711f266b49a582 100644 (file)
--- a/runtime/StringRecursionChecker.h
+++ b/runtime/StringRecursionChecker.h
@@ -31,27 +31,27 @@ public:
     StringRecursionChecker(ExecState*, JSObject* thisObject);
     ~StringRecursionChecker();
 
     StringRecursionChecker(ExecState*, JSObject* thisObject);
     ~StringRecursionChecker();
 

-    EncodedJSValue earlyReturnValue() const; // 0 if everything is OK, value to return for failure cases
+    JSValue earlyReturnValue() const; // 0 if everything is OK, value to return for failure cases

 
 private:
 
 private:

-    EncodedJSValue throwStackOverflowError();
-    EncodedJSValue emptyString();
-    EncodedJSValue performCheck();
+    JSValue throwStackOverflowError();
+    JSValue emptyString();
+    JSValue performCheck();

 
     ExecState* m_exec;
     JSObject* m_thisObject;
 
     ExecState* m_exec;
     JSObject* m_thisObject;

-    EncodedJSValue m_earlyReturnValue;
+    JSValue m_earlyReturnValue;

 };
 
 };
 

-inline EncodedJSValue StringRecursionChecker::performCheck()
+inline JSValue StringRecursionChecker::performCheck()

 {
     int size = m_exec->globalData().stringRecursionCheckVisitedObjects.size();
     if (size >= MaxSmallThreadReentryDepth && size >= m_exec->globalData().maxReentryDepth)
         return throwStackOverflowError();
 {
     int size = m_exec->globalData().stringRecursionCheckVisitedObjects.size();
     if (size >= MaxSmallThreadReentryDepth && size >= m_exec->globalData().maxReentryDepth)
         return throwStackOverflowError();

-    bool alreadyVisited = !m_exec->globalData().stringRecursionCheckVisitedObjects.add(m_thisObject).second;
+    bool alreadyVisited = !m_exec->globalData().stringRecursionCheckVisitedObjects.add(m_thisObject).isNewEntry;

     if (alreadyVisited)
         return emptyString(); // Return empty string to avoid infinite recursion.
     if (alreadyVisited)
         return emptyString(); // Return empty string to avoid infinite recursion.

-    return 0; // Indicate success.
+    return JSValue(); // Indicate success.

 }
 
 inline StringRecursionChecker::StringRecursionChecker(ExecState* exec, JSObject* thisObject)
 }
 
 inline StringRecursionChecker::StringRecursionChecker(ExecState* exec, JSObject* thisObject)


@@ -61,7 +61,7 @@ inline StringRecursionChecker::StringRecursionChecker(ExecState* exec, JSObject*
 {
 }
 
 {
 }
 

-inline EncodedJSValue StringRecursionChecker::earlyReturnValue() const
+inline JSValue StringRecursionChecker::earlyReturnValue() const

 {
     return m_earlyReturnValue;
 }
 {
     return m_earlyReturnValue;
 }