summaryrefslogtreecommitdiff
path: root/Source/JavaScriptCore/runtime/StringRecursionChecker.h
diff options
context:
space:
mode:
Diffstat (limited to 'Source/JavaScriptCore/runtime/StringRecursionChecker.h')
-rw-r--r--Source/JavaScriptCore/runtime/StringRecursionChecker.h20
1 files changed, 3 insertions, 17 deletions
diff --git a/Source/JavaScriptCore/runtime/StringRecursionChecker.h b/Source/JavaScriptCore/runtime/StringRecursionChecker.h
index 0f1990e76..c99dd4ff1 100644
--- a/Source/JavaScriptCore/runtime/StringRecursionChecker.h
+++ b/Source/JavaScriptCore/runtime/StringRecursionChecker.h
@@ -52,15 +52,7 @@ inline JSValue StringRecursionChecker::performCheck()
VM& vm = m_exec->vm();
if (!vm.isSafeToRecurse())
return throwStackOverflowError();
-
- bool alreadyVisited = false;
- if (!vm.stringRecursionCheckFirstObject)
- vm.stringRecursionCheckFirstObject = m_thisObject;
- else if (vm.stringRecursionCheckFirstObject == m_thisObject)
- alreadyVisited = true;
- else
- alreadyVisited = !vm.stringRecursionCheckVisitedObjects.add(m_thisObject).isNewEntry;
-
+ bool alreadyVisited = !vm.stringRecursionCheckVisitedObjects.add(m_thisObject).isNewEntry;
if (alreadyVisited)
return emptyString(); // Return empty string to avoid infinite recursion.
return JSValue(); // Indicate success.
@@ -82,14 +74,8 @@ inline StringRecursionChecker::~StringRecursionChecker()
{
if (m_earlyReturnValue)
return;
-
- VM& vm = m_exec->vm();
- if (vm.stringRecursionCheckFirstObject == m_thisObject)
- vm.stringRecursionCheckFirstObject = nullptr;
- else {
- ASSERT(vm.stringRecursionCheckVisitedObjects.contains(m_thisObject));
- vm.stringRecursionCheckVisitedObjects.remove(m_thisObject);
- }
+ ASSERT(m_exec->vm().stringRecursionCheckVisitedObjects.contains(m_thisObject));
+ m_exec->vm().stringRecursionCheckVisitedObjects.remove(m_thisObject);
}
}