<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[205569] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/205569">205569</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2016-09-07 15:10:50 -0700 (Wed, 07 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add CatchScope and force all exception checks to be via ThrowScope or CatchScope.
https://bugs.webkit.org/show_bug.cgi?id=161498
Reviewed by Geoffrey Garen.
Source/JavaScriptCore:
This patch refactors the ThrowScope class, and introduces a base ExceptionScope
that ThrowScope extends. A CatchScope which extends the ExceptionScope is also
introduced.
ENABLE(THROW_SCOPE_VERIFICATION) is now renamed to ENABLE(EXCEPTION_SCOPE_VERIFICATION)
which is a more suitable name now.
Note: exception scope verification is still disabled by default. There are still
many places that need to be fixed up or re-expressed in a way that is friendly
to the verification. I'll address those in subsequent patches.
After this patch, the code will statically enforce that:
1. all calls to throwException() go through a ThrowScope.
2. all calls to clearException() go through a CatchScope.
3. all exception checks go through an ExceptionScope in the form of a ThrowScope
or CatchScope.
A Summary of how to use ExceptionScopes
=======================================
1. If a function can throw a JS exception, it should declare a ThrowScope at the
top of the function (as early as possible).
2. If a function can clear JS exceptions, it should declare a CatchScope at the
top of the function (as early as possible).
Declaring a ThrowScope in a function means that the function may throw an exception
that its caller will have to handle. Declaring a CatchScope in a function means
that the function intends to clear pending exceptions before returning to its
caller.
For more details, see the notes below.
Everything you may want to know about ExceptionScopes
=====================================================
ExceptionScope verification works to simulate exception throws and detect cases
where exception checks are missing. The notes below will cover:
1. The VM::m_needExceptionCheck bit
2. ThrowScopes and CatchScopes
3. Verification of needed exception checks
3. Checking Exceptions
4. Simulating throws
5. Using ThrowScope::release()
6. Checking exceptions with ThrowScope::exception() / CatchScope::exception()
7. Checking exceptions by checking callee results
8. Debugging verification errors
1. The VM::m_needExceptionCheck bit
The VM has a m_needExceptionCheck bit that indicates when an exception may be
thrown. You can think of the m_needExceptionCheck bit being set as a simulated
throw.
2. ThrowScopes and CatchScopes
Only ThrowScopes may throwException. Only CatchScopes may catchException.
Every throw site must declare a ThrowScope instance using DECLARE_THROW_SCOPE
at the top of its function (as early as possible) e.g.
void foo(...)
{
auto scope = DECLARE_THROW_SCOPE(vm);
...
throwException(exec, scope, ...);
}
Note: by convention, every throw helper function must take a ThrowScope argument
instead of instantiating its own ThrowScope. This allows the throw to be
attributed to the client code rather than the throw helper itself.
Every catch site (i.e. a site that calls clearException()) must declare a
CatchScope instance using DECLARE_CATCH_SCOPE at the top of its function.
If a function can both throw or clear exceptions, then the ThrowScope should
be declared first so that it can simulate a throw to the function's caller.
Note: ThrowScope and CatchScope both extend ExceptionScope so that ThrowScopes
can be aware if there's an enclosing CatchScope between it and the point where
C++ code returns to JS code. This is needed to determine if the ThrowScope
should simulate a re-throw or not. See (4) below for more details on returning
to JS code.
3. Verification of needed exception checks
a. On construction, each ThrowScope and CatchScope will verify that
VM::m_needExceptionCheck is not set.
This ensures that the caller of the current function has checked for exceptions
where needed before doing more work which lead to calling the current function.
b. On destruction, each ThrowScope and CatchScope will verify that
VM::m_needExceptionCheck is not set. This verification will be skipped if
the ThrowScope has been released (see (5) below).
This ensures that the function that owns this exception scope is not missing
any exception checks before returning.
c. When throwing an exception, the ThrowScope will verify that VM::m_needExceptionCheck
is not already set, unless it's been ask to rethrow the same Exception object.
4. Simulating throws
Throws are simulated by setting the m_needExceptionCheck bit.
The bit will only be set in the ThrowScope destructor except when the ThrowScope
detects the caller is a LLInt or JIT function. LLInt or JIT functions will always
check for exceptions after a host C++ function returns to it. However, they will
not clear the m_needExceptionCheck bit.
Hence, if the ThrowScope destructor detects the caller is a LLInt or JIT function,
it will just skip the setting of the bit.
Note: it is not needed nor correct to set the m_needExceptionCheck bit in the
throwException methods. This is because, in practice, we always return
immediately after throwing an exception. It doesn't make sense to set the bit in
the throw just to have to clear it immediately after before we do verification in
the ThrowScope destructor.
5. Using ThrowScope::release()
Calling release() means that the scope is released from its obligation to
verify the VM::m_needExceptionCheck bit on destruction.
release() should only be used at the bottom of a function if:
a. This function is going to let its caller check and handle the exception, e.g.
void foo(...)
{
auto scope = DECLARE_THROW_SCOPE(vm);
auto result = goo(); // may throw.
... // Code that will are not affected by a pending exceptions.
scope.release(); // tell the ThrowScope that the caller will handle the exception.
return result;
}
b. This function is going to do a tail call that may throw.
void foo(...)
{
auto scope = DECLARE_THROW_SCOPE(vm);
...
scope.release(); // tell the ThrowScope that the caller will handle the exception.
return goo(); // may throw.
}
release() should not be used in code paths that branch. For example:
void foo(...)
{
auto scope = DECLARE_THROW_SCOPE(vm);
auto result = goo1(); // may throw.
scope.release(); // WRONG !!! Don't do this.
if (result)
return;
result = goo2(); // may throw.
...
return result;
}
The above will result in a verification error in goo2()'s ThrowScope. The
proper way to fix this verification is to do either (6) or (7) below.
6. Checking exceptions with ThrowScope::exception() / CatchScope::exception()
ThrowScope/CatchScope::exception() returns the thrown Exception object if
there is one pending. Else, it returns nullptr.
It also clears the m_needExceptionCheck bit thereby indicating that we've
satisfied the needed exception check. For example,
void foo(...)
{
auto scope = DECLARE_THROW_SCOPE(vm);
auto result = goo1(); // may throw.
if (scope.exception())
return;
result = goo2(); // may throw.
...
return result;
}
But sometimes, for optimization reasons, we may choose to test the result of
the callee function instead doing a load of the VM exception value. See (7)
below.
7. Checking exceptions by checking callee results
This approach should only be applied when it makes a difference to performance.
If we need to do this, we should add an ASSERT() that invokes the scope's
exception() method to verify the result. Since exception scope verification
is only done on DEBUG builds, this ASSERT will satisfy the verification
requirements without impacting performance. For example,
void foo(...)
{
auto scope = DECLARE_THROW_SCOPE(vm);
bool failed = goo1(); // may throw.
ASSERT(!!scope.exception() == failed)
if (failed)
return;
result = goo2(); // may throw.
...
return result;
}
8. Debugging verification errors
a. When verification fails, you will see a message followed by an assertion
failure. For example:
ERROR: Unchecked JS exception:
This scope can throw a JS exception: setUpCall @ /Volumes/Data/ws6/OpenSource/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp:1245
(ExceptionScope::m_recursionDepth was ...)
But the exception was unchecked as of this scope: varargsSetup @ /Volumes/Data/ws6/OpenSource/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp:1398
(ExceptionScope::m_recursionDepth was ...)
[ backtrace here ]
The message tells you that failure was detected at in varargsSetup() at
LLIntSlowPaths.cpp line 1398, and that the missing exception check should
have happened somewhere between the call to setUpCall() at LLIntSlowPaths.cpp
line 1245 and it.
If that is insufficient information, you can ...
b. Dump simulated throws
Re-run the test case with JSC_dumpSimulatedThrows=true. You will also see
back traces at each simulated throw.
c. Narrowing down the source of a simulated throw
Another technique for narrowing down the source of simulated throws is by
further dividing a function to smaller regions by separating each region
with additional local throw scopes. For example,
... // Region 1
{ auto scope = DECLARE_THROW_SCOPE(vm); }
... // Region 2
{ auto scope = DECLARE_THROW_SCOPE(vm); }
... // Region 3
* API/APIUtils.h:
(handleExceptionIfNeeded):
* CMakeLists.txt:
* JavaScriptCore.xcodeproj/project.pbxproj:
* bindings/ScriptFunctionCall.cpp:
(Deprecated::ScriptFunctionCall::call):
* bindings/ScriptValue.cpp:
(Deprecated::ScriptValue::toString):
* debugger/Debugger.cpp:
(JSC::Debugger::pauseIfNeeded):
* debugger/DebuggerCallFrame.cpp:
(JSC::DebuggerCallFrame::evaluateWithScopeExtension):
* dfg/DFGOSRExitCompiler.cpp:
* dfg/DFGOperations.cpp:
(JSC::DFG::operationPutByValInternal):
* inspector/InjectedScriptManager.cpp:
(Inspector::InjectedScriptManager::createInjectedScript):
* inspector/JSGlobalObjectInspectorController.cpp:
(Inspector::JSGlobalObjectInspectorController::reportAPIException):
* inspector/JSInjectedScriptHost.cpp:
(Inspector::JSInjectedScriptHost::evaluateWithScopeExtension):
(Inspector::JSInjectedScriptHost::getInternalProperties):
(Inspector::JSInjectedScriptHost::weakMapEntries):
(Inspector::JSInjectedScriptHost::weakSetEntries):
(Inspector::JSInjectedScriptHost::iteratorEntries):
* inspector/JSJavaScriptCallFrame.cpp:
(Inspector::JSJavaScriptCallFrame::evaluateWithScopeExtension):
* inspector/ScriptCallStackFactory.cpp:
(Inspector::extractSourceInformationFromException):
* interpreter/CachedCall.h:
(JSC::CachedCall::CachedCall):
* interpreter/CallFrame.h:
(JSC::ExecState::clearException): Deleted.
(JSC::ExecState::exception): Deleted.
(JSC::ExecState::hadException): Deleted.
(JSC::ExecState::lastException): Deleted.
(JSC::ExecState::clearLastException): Deleted.
* interpreter/Interpreter.cpp:
(JSC::eval):
(JSC::sizeOfVarargs):
(JSC::notifyDebuggerOfUnwinding):
(JSC::Interpreter::unwind):
(JSC::Interpreter::execute):
(JSC::Interpreter::executeCall):
(JSC::Interpreter::executeConstruct):
(JSC::Interpreter::prepareForRepeatCall):
(JSC::Interpreter::debug):
* interpreter/Interpreter.h:
(JSC::SuspendExceptionScope::SuspendExceptionScope):
* interpreter/ShadowChicken.cpp:
(JSC::ShadowChicken::functionsOnStack):
* jit/JITCode.cpp:
(JSC::JITCode::execute):
* jit/JITExceptions.cpp:
(JSC::genericUnwind):
* jit/JITOperations.cpp:
(JSC::getByVal):
* jsc.cpp:
(WTF::ImpureGetter::getOwnPropertySlot):
(GlobalObject::moduleLoaderResolve):
(GlobalObject::moduleLoaderFetch):
(functionCreateElement):
(functionRun):
(functionRunString):
(functionLoad):
(functionLoadString):
(functionReadFile):
(functionCheckSyntax):
(functionSetRandomSeed):
(functionLoadModule):
(functionCreateBuiltin):
(functionCheckModuleSyntax):
(functionGenerateHeapSnapshot):
(functionSamplingProfilerStackTraces):
(dumpException):
(checkUncaughtException):
(runWithScripts):
(runInteractive):
* llint/LLIntExceptions.cpp:
(JSC::LLInt::returnToThrow):
(JSC::LLInt::callToThrow):
* llint/LLIntSlowPaths.cpp:
(JSC::LLInt::LLINT_SLOW_PATH_DECL):
* profiler/ProfilerBytecodeSequence.cpp:
(JSC::Profiler::BytecodeSequence::addSequenceProperties):
* profiler/ProfilerCompilation.cpp:
(JSC::Profiler::Compilation::toJS):
* profiler/ProfilerDatabase.cpp:
(JSC::Profiler::Database::toJS):
* profiler/ProfilerOSRExitSite.cpp:
(JSC::Profiler::OSRExitSite::toJS):
* profiler/ProfilerOriginStack.cpp:
(JSC::Profiler::OriginStack::toJS):
* runtime/ArrayPrototype.cpp:
(JSC::speciesConstructArray):
(JSC::shift):
(JSC::unshift):
(JSC::arrayProtoFuncToString):
(JSC::arrayProtoFuncToLocaleString):
(JSC::slowJoin):
(JSC::fastJoin):
(JSC::arrayProtoFuncJoin):
(JSC::arrayProtoFuncPop):
(JSC::arrayProtoFuncPush):
(JSC::arrayProtoFuncReverse):
(JSC::arrayProtoFuncShift):
(JSC::arrayProtoFuncSlice):
(JSC::arrayProtoFuncSplice):
(JSC::arrayProtoFuncUnShift):
(JSC::arrayProtoFuncIndexOf):
(JSC::arrayProtoFuncLastIndexOf):
(JSC::moveElements):
(JSC::concatAppendOne):
(JSC::arrayProtoPrivateFuncConcatMemcpy):
* runtime/BooleanConstructor.cpp:
(JSC::constructWithBooleanConstructor):
* runtime/CallData.cpp:
(JSC::call):
* runtime/CatchScope.cpp: Added.
(JSC::CatchScope::CatchScope):
(JSC::CatchScope::~CatchScope):
* runtime/CatchScope.h: Added.
(JSC::CatchScope::clearException):
(JSC::CatchScope::CatchScope):
* runtime/CommonSlowPaths.cpp:
(JSC::SLOW_PATH_DECL):
* runtime/CommonSlowPaths.h:
(JSC::CommonSlowPaths::opIn):
* runtime/CommonSlowPathsExceptions.cpp:
(JSC::CommonSlowPaths::interpreterThrowInCaller):
* runtime/Completion.cpp:
(JSC::evaluate):
(JSC::rejectPromise):
(JSC::loadAndEvaluateModule):
(JSC::loadModule):
* runtime/ConsoleObject.cpp:
(JSC::consoleProtoFuncAssert):
(JSC::consoleProtoFuncProfile):
(JSC::consoleProtoFuncProfileEnd):
(JSC::consoleProtoFuncTakeHeapSnapshot):
(JSC::consoleProtoFuncTime):
(JSC::consoleProtoFuncTimeEnd):
* runtime/DateConstructor.cpp:
(JSC::constructDate):
(JSC::dateParse):
* runtime/DatePrototype.cpp:
(JSC::dateProtoFuncToPrimitiveSymbol):
(JSC::dateProtoFuncToJSON):
* runtime/ErrorConstructor.cpp:
(JSC::Interpreter::constructWithErrorConstructor):
* runtime/ErrorInstance.cpp:
(JSC::ErrorInstance::sanitizedToString):
* runtime/ErrorPrototype.cpp:
(JSC::errorProtoFuncToString):
* runtime/ExceptionEventLocation.cpp: Added.
(WTF::printInternal):
* runtime/ExceptionEventLocation.h: Copied from Source/JavaScriptCore/runtime/ThrowScopeLocation.h.
(JSC::ExceptionEventLocation::ExceptionEventLocation):
(JSC::ThrowScopeLocation::ThrowScopeLocation): Deleted.
* runtime/ExceptionHelpers.h:
* runtime/ExceptionScope.cpp: Added.
(JSC::ExceptionScope::ExceptionScope):
(JSC::ExceptionScope::~ExceptionScope):
* runtime/ExceptionScope.h: Added.
(JSC::ExceptionScope::vm):
(JSC::ExceptionScope::recursionDepth):
(JSC::ExceptionScope::exception):
(JSC::ExceptionScope::ExceptionScope):
* runtime/FunctionConstructor.cpp:
(JSC::constructFunctionSkippingEvalEnabledCheck):
* runtime/FunctionPrototype.cpp:
(JSC::functionProtoFuncBind):
* runtime/GenericArgumentsInlines.h:
(JSC::GenericArguments<Type>::copyToArguments):
* runtime/GetterSetter.cpp:
(JSC::callGetter):
* runtime/InspectorInstrumentationObject.cpp:
(JSC::inspectorInstrumentationObjectLog):
* runtime/InternalFunction.cpp:
(JSC::InternalFunction::createSubclassStructure):
* runtime/IntlCollator.cpp:
(JSC::IntlCollator::initializeCollator):
(JSC::IntlCollator::createCollator):
(JSC::IntlCollator::resolvedOptions):
* runtime/IntlCollatorConstructor.cpp:
(JSC::constructIntlCollator):
(JSC::IntlCollatorConstructorFuncSupportedLocalesOf):
* runtime/IntlCollatorPrototype.cpp:
(JSC::IntlCollatorFuncCompare):
(JSC::IntlCollatorPrototypeGetterCompare):
* runtime/IntlDateTimeFormat.cpp:
(JSC::toDateTimeOptionsAnyDate):
(JSC::IntlDateTimeFormat::initializeDateTimeFormat):
(JSC::IntlDateTimeFormat::resolvedOptions):
(JSC::IntlDateTimeFormat::format):
* runtime/IntlDateTimeFormatConstructor.cpp:
(JSC::constructIntlDateTimeFormat):
(JSC::IntlDateTimeFormatConstructorFuncSupportedLocalesOf):
* runtime/IntlDateTimeFormatPrototype.cpp:
(JSC::IntlDateTimeFormatFuncFormatDateTime):
(JSC::IntlDateTimeFormatPrototypeGetterFormat):
* runtime/IntlNumberFormat.cpp:
(JSC::IntlNumberFormat::initializeNumberFormat):
(JSC::IntlNumberFormat::createNumberFormat):
(JSC::IntlNumberFormat::resolvedOptions):
* runtime/IntlNumberFormatConstructor.cpp:
(JSC::constructIntlNumberFormat):
(JSC::IntlNumberFormatConstructorFuncSupportedLocalesOf):
* runtime/IntlNumberFormatPrototype.cpp:
(JSC::IntlNumberFormatFuncFormatNumber):
(JSC::IntlNumberFormatPrototypeGetterFormat):
* runtime/IntlObject.cpp:
(JSC::intlBooleanOption):
(JSC::intlStringOption):
(JSC::intlNumberOption):
(JSC::canonicalizeLocaleList):
(JSC::supportedLocales):
* runtime/IntlObjectInlines.h:
(JSC::constructIntlInstanceWithWorkaroundForLegacyIntlConstructor):
* runtime/IteratorOperations.cpp:
(JSC::iteratorNext):
(JSC::iteratorStep):
(JSC::iteratorClose):
(JSC::iteratorForIterable):
* runtime/IteratorOperations.h:
(JSC::forEachInIterable):
* runtime/JSArray.cpp:
(JSC::JSArray::pop):
(JSC::JSArray::push):
(JSC::JSArray::copyToArguments):
* runtime/JSArrayBufferConstructor.cpp:
(JSC::constructArrayBuffer):
* runtime/JSArrayBufferPrototype.cpp:
(JSC::arrayBufferProtoFuncSlice):
* runtime/JSArrayInlines.h:
(JSC::getLength):
(JSC::toLength):
* runtime/JSBoundFunction.cpp:
(JSC::getBoundFunctionStructure):
(JSC::JSBoundFunction::create):
* runtime/JSCJSValue.cpp:
(JSC::JSValue::putToPrimitive):
(JSC::JSValue::putToPrimitiveByIndex):
(JSC::JSValue::toStringSlowCase):
* runtime/JSCJSValueInlines.h:
(JSC::toPreferredPrimitiveType):
(JSC::JSValue::getPropertySlot):
(JSC::JSValue::equalSlowCaseInline):
* runtime/JSDataViewPrototype.cpp:
(JSC::getData):
(JSC::setData):
* runtime/JSFunction.cpp:
(JSC::JSFunction::setFunctionName):
* runtime/JSGenericTypedArrayView.h:
(JSC::JSGenericTypedArrayView::setIndex):
* runtime/JSGenericTypedArrayViewConstructorInlines.h:
(JSC::constructGenericTypedArrayViewFromIterator):
(JSC::constructGenericTypedArrayViewWithArguments):
(JSC::constructGenericTypedArrayView):
* runtime/JSGenericTypedArrayViewPrototypeFunctions.h:
(JSC::speciesConstruct):
(JSC::genericTypedArrayViewProtoFuncCopyWithin):
(JSC::genericTypedArrayViewProtoFuncIncludes):
(JSC::genericTypedArrayViewProtoFuncIndexOf):
(JSC::genericTypedArrayViewProtoFuncJoin):
(JSC::genericTypedArrayViewProtoFuncLastIndexOf):
(JSC::genericTypedArrayViewProtoFuncSlice):
(JSC::genericTypedArrayViewPrivateFuncSubarrayCreate):
* runtime/JSGlobalObject.h:
(JSC::constructEmptyArray):
(JSC::constructArray):
(JSC::constructArrayNegativeIndexed):
* runtime/JSGlobalObjectFunctions.cpp:
(JSC::globalFuncEval):
* runtime/JSJob.cpp:
(JSC::JSJobMicrotask::run):
* runtime/JSModuleEnvironment.cpp:
(JSC::JSModuleEnvironment::getOwnPropertySlot):
* runtime/JSModuleLoader.cpp:
(JSC::JSModuleLoader::fetch):
* runtime/JSModuleNamespaceObject.cpp:
(JSC::JSModuleNamespaceObject::finishCreation):
(JSC::JSModuleNamespaceObject::getOwnPropertySlot):
* runtime/JSModuleRecord.cpp:
(JSC::JSModuleRecord::instantiateDeclarations):
* runtime/JSONObject.cpp:
(JSC::Stringifier::Stringifier):
(JSC::Stringifier::stringify):
(JSC::Stringifier::toJSON):
(JSC::Stringifier::appendStringifiedValue):
(JSC::Stringifier::Holder::appendNextProperty):
(JSC::Walker::walk):
(JSC::JSONProtoFuncParse):
* runtime/JSObject.cpp:
(JSC::ordinarySetSlow):
(JSC::JSObject::setPrototypeWithCycleCheck):
(JSC::callToPrimitiveFunction):
(JSC::JSObject::ordinaryToPrimitive):
(JSC::JSObject::defaultHasInstance):
(JSC::JSObject::getPropertyNames):
(JSC::JSObject::toNumber):
(JSC::JSObject::toString):
(JSC::JSObject::defineOwnNonIndexProperty):
(JSC::JSObject::getGenericPropertyNames):
(JSC::JSObject::getMethod):
* runtime/JSObjectInlines.h:
(JSC::createListFromArrayLike):
(JSC::JSObject::getPropertySlot):
(JSC::JSObject::getNonIndexPropertySlot):
* runtime/JSPromiseConstructor.cpp:
(JSC::constructPromise):
* runtime/JSPropertyNameEnumerator.h:
(JSC::propertyNameEnumerator):
* runtime/JSPropertyNameIterator.cpp:
(JSC::JSPropertyNameIterator::create):
* runtime/JSScope.cpp:
(JSC::isUnscopable):
(JSC::JSScope::resolve):
* runtime/JSString.cpp:
(JSC::JSString::equalSlowCase):
* runtime/JSStringJoiner.cpp:
(JSC::JSStringJoiner::join):
* runtime/LiteralParser.cpp:
(JSC::LiteralParser<CharType>::parse):
* runtime/MapConstructor.cpp:
(JSC::constructMap):
* runtime/MathObject.cpp:
(JSC::mathProtoFuncClz32):
(JSC::mathProtoFuncHypot):
(JSC::mathProtoFuncIMul):
* runtime/ModuleLoaderPrototype.cpp:
(JSC::moduleLoaderPrototypeParseModule):
(JSC::moduleLoaderPrototypeRequestedModules):
(JSC::moduleLoaderPrototypeModuleDeclarationInstantiation):
* runtime/NativeErrorConstructor.cpp:
(JSC::Interpreter::constructWithNativeErrorConstructor):
* runtime/NumberConstructor.cpp:
(JSC::constructWithNumberConstructor):
* runtime/ObjectConstructor.cpp:
(JSC::constructObject):
(JSC::objectConstructorGetPrototypeOf):
(JSC::objectConstructorSetPrototypeOf):
(JSC::objectConstructorGetOwnPropertyDescriptor):
(JSC::objectConstructorGetOwnPropertyDescriptors):
(JSC::objectConstructorGetOwnPropertyNames):
(JSC::objectConstructorGetOwnPropertySymbols):
(JSC::objectConstructorKeys):
(JSC::ownEnumerablePropertyKeys):
(JSC::toPropertyDescriptor):
(JSC::objectConstructorDefineProperty):
(JSC::defineProperties):
(JSC::objectConstructorSeal):
(JSC::objectConstructorFreeze):
(JSC::objectConstructorIsSealed):
(JSC::objectConstructorIsFrozen):
(JSC::objectConstructorIsExtensible):
(JSC::ownPropertyKeys):
* runtime/ObjectConstructor.h:
(JSC::constructObjectFromPropertyDescriptor):
* runtime/ObjectPrototype.cpp:
(JSC::objectProtoFuncHasOwnProperty):
(JSC::objectProtoFuncIsPrototypeOf):
(JSC::objectProtoFuncDefineGetter):
(JSC::objectProtoFuncDefineSetter):
(JSC::objectProtoFuncLookupGetter):
(JSC::objectProtoFuncLookupSetter):
(JSC::objectProtoFuncPropertyIsEnumerable):
(JSC::objectProtoFuncToLocaleString):
(JSC::objectProtoFuncToString):
* runtime/Operations.cpp:
(JSC::jsAddSlowCase):
* runtime/Options.h:
* runtime/PropertyDescriptor.cpp:
(JSC::PropertyDescriptor::slowGetterSetter):
* runtime/ProxyConstructor.cpp:
(JSC::makeRevocableProxy):
* runtime/ProxyObject.cpp:
(JSC::ProxyObject::toStringName):
(JSC::performProxyGet):
(JSC::ProxyObject::performGet):
(JSC::ProxyObject::performInternalMethodGetOwnProperty):
(JSC::ProxyObject::performHasProperty):
(JSC::ProxyObject::performPut):
(JSC::ProxyObject::putByIndexCommon):
(JSC::performProxyCall):
(JSC::performProxyConstruct):
(JSC::ProxyObject::performDelete):
(JSC::ProxyObject::performPreventExtensions):
(JSC::ProxyObject::performIsExtensible):
(JSC::ProxyObject::performDefineOwnProperty):
(JSC::ProxyObject::performGetOwnPropertyNames):
(JSC::ProxyObject::performSetPrototype):
(JSC::ProxyObject::performGetPrototype):
* runtime/ReflectObject.cpp:
(JSC::reflectObjectConstruct):
(JSC::reflectObjectDefineProperty):
(JSC::reflectObjectGet):
(JSC::reflectObjectGetOwnPropertyDescriptor):
(JSC::reflectObjectIsExtensible):
(JSC::reflectObjectPreventExtensions):
(JSC::reflectObjectSet):
(JSC::reflectObjectSetPrototypeOf):
* runtime/RegExpConstructor.cpp:
(JSC::toFlags):
(JSC::regExpCreate):
(JSC::constructRegExp):
* runtime/RegExpConstructor.h:
(JSC::isRegExp):
* runtime/RegExpObject.cpp:
(JSC::collectMatches):
(JSC::RegExpObject::matchGlobal):
* runtime/RegExpPrototype.cpp:
(JSC::regExpProtoFuncCompile):
(JSC::flagsString):
(JSC::regExpProtoFuncToString):
(JSC::regExpProtoGetterFlags):
(JSC::regExpProtoFuncSearchFast):
(JSC::regExpProtoFuncSplitFast):
* runtime/SetConstructor.cpp:
(JSC::constructSet):
* runtime/StringConstructor.cpp:
(JSC::stringFromCodePoint):
(JSC::constructWithStringConstructor):
* runtime/StringObject.cpp:
(JSC::StringObject::defineOwnProperty):
* runtime/StringPrototype.cpp:
(JSC::replaceUsingRegExpSearch):
(JSC::operationStringProtoFuncReplaceRegExpEmptyStr):
(JSC::replaceUsingStringSearch):
(JSC::replace):
(JSC::stringProtoFuncReplaceUsingRegExp):
(JSC::stringProtoFuncReplaceUsingStringSearch):
(JSC::stringProtoFuncCodePointAt):
(JSC::stringProtoFuncSlice):
(JSC::stringProtoFuncSplitFast):
(JSC::stringProtoFuncSubstr):
(JSC::stringProtoFuncSubstring):
(JSC::stringProtoFuncLocaleCompare):
(JSC::toLocaleCase):
(JSC::stringProtoFuncBig):
(JSC::stringProtoFuncSmall):
(JSC::stringProtoFuncBlink):
(JSC::stringProtoFuncBold):
(JSC::stringProtoFuncFixed):
(JSC::stringProtoFuncItalics):
(JSC::stringProtoFuncStrike):
(JSC::stringProtoFuncSub):
(JSC::stringProtoFuncSup):
(JSC::stringProtoFuncFontcolor):
(JSC::stringProtoFuncFontsize):
(JSC::stringProtoFuncAnchor):
(JSC::stringProtoFuncLink):
(JSC::trimString):
(JSC::stringProtoFuncStartsWith):
(JSC::stringProtoFuncEndsWith):
(JSC::stringIncludesImpl):
(JSC::stringProtoFuncIncludes):
(JSC::builtinStringIncludesInternal):
(JSC::stringProtoFuncNormalize):
* runtime/SymbolConstructor.cpp:
(JSC::symbolConstructorFor):
* runtime/TemplateRegistry.cpp:
(JSC::TemplateRegistry::getTemplateObject):
* runtime/ThrowScope.cpp:
(JSC::ThrowScope::ThrowScope):
(JSC::ThrowScope::~ThrowScope):
(JSC::ThrowScope::throwException):
(JSC::ThrowScope::simulateThrow):
(JSC::ThrowScope::printIfNeedCheck): Deleted.
(JSC::ThrowScope::verifyExceptionCheckNeedIsSatisfied): Deleted.
* runtime/ThrowScope.h:
(JSC::ThrowScope::release):
(JSC::ThrowScope::ThrowScope):
(JSC::ThrowScope::throwException):
(JSC::ThrowScope::vm): Deleted.
(JSC::ThrowScope::exception): Deleted.
* runtime/ThrowScopeLocation.h: Removed.
* runtime/VM.cpp:
(JSC::VM::verifyExceptionCheckNeedIsSatisfied):
* runtime/VM.h:
(JSC::VM::exception):
(JSC::VM::clearException):
(JSC::VM::setException): Deleted.
* runtime/WeakMapConstructor.cpp:
(JSC::constructWeakMap):
* runtime/WeakSetConstructor.cpp:
(JSC::constructWeakSet):
* tools/JSDollarVMPrototype.cpp:
(JSC::functionPrint):
Source/WebCore:
No new test because there is no behavior change in general except for 1 bug fix.
That bug is already caught by existing tests with the introduction of the CatchScope.
Fixes a bug in JSEventListener::handleEvent() where the exception thrown from
a failed attempt to get the handleEvent callback is not handled.
* ForwardingHeaders/runtime/CatchScope.h: Added.
* Modules/encryptedmedia/CDMSessionClearKey.cpp:
(WebCore::CDMSessionClearKey::update):
* Modules/indexeddb/IDBObjectStore.cpp:
(WebCore::IDBObjectStore::putOrAdd):
* Modules/indexeddb/server/UniqueIDBDatabase.cpp:
(WebCore::IDBServer::UniqueIDBDatabase::performPutOrAdd):
* Modules/mediastream/SDPProcessor.cpp:
(WebCore::SDPProcessor::callScript):
* Modules/plugins/QuickTimePluginReplacement.mm:
(WebCore::QuickTimePluginReplacement::ensureReplacementScriptInjected):
(WebCore::QuickTimePluginReplacement::installReplacement):
* bindings/js/ArrayValue.cpp:
(WebCore::ArrayValue::get):
* bindings/js/Dictionary.cpp:
(WebCore::Dictionary::getOwnPropertiesAsStringHashMap):
* bindings/js/IDBBindingUtilities.cpp:
(WebCore::toJS):
* bindings/js/JSApplePaySessionCustom.cpp:
(WebCore::JSApplePaySession::completeShippingMethodSelection):
(WebCore::JSApplePaySession::completeShippingContactSelection):
(WebCore::JSApplePaySession::completePaymentMethodSelection):
* bindings/js/JSAudioTrackCustom.cpp:
(WebCore::JSAudioTrack::setKind):
(WebCore::JSAudioTrack::setLanguage):
* bindings/js/JSBlobCustom.cpp:
(WebCore::constructJSBlob):
* bindings/js/JSCSSStyleDeclarationCustom.cpp:
(WebCore::JSCSSStyleDeclaration::getPropertyCSSValue):
* bindings/js/JSCommandLineAPIHostCustom.cpp:
(WebCore::getJSListenerFunctions):
* bindings/js/JSCryptoAlgorithmDictionary.cpp:
(WebCore::JSCryptoAlgorithmDictionary::getAlgorithmIdentifier):
(WebCore::getHashAlgorithm):
(WebCore::createAesCbcParams):
(WebCore::createAesKeyGenParams):
(WebCore::createHmacParams):
(WebCore::createHmacKeyParams):
(WebCore::createRsaKeyGenParams):
(WebCore::createRsaOaepParams):
(WebCore::createRsaSsaParams):
* bindings/js/JSCryptoKeySerializationJWK.cpp:
(WebCore::getJSArrayFromJSON):
(WebCore::getStringFromJSON):
(WebCore::getBooleanFromJSON):
(WebCore::JSCryptoKeySerializationJWK::JSCryptoKeySerializationJWK):
(WebCore::JSCryptoKeySerializationJWK::reconcileUsages):
(WebCore::JSCryptoKeySerializationJWK::keyDataOctetSequence):
(WebCore::JSCryptoKeySerializationJWK::keyDataRSAComponents):
(WebCore::JSCryptoKeySerializationJWK::keyData):
(WebCore::buildJSONForRSAComponents):
(WebCore::addUsagesToJSON):
(WebCore::JSCryptoKeySerializationJWK::serialize):
* bindings/js/JSCustomElementInterface.cpp:
(WebCore::JSCustomElementInterface::constructElement):
(WebCore::constructCustomElementSynchronously):
(WebCore::JSCustomElementInterface::upgradeElement):
* bindings/js/JSCustomElementRegistryCustom.cpp:
(WebCore::getCustomElementCallback):
(WebCore::JSCustomElementRegistry::define):
(WebCore::whenDefinedPromise):
(WebCore::JSCustomElementRegistry::whenDefined):
* bindings/js/JSDOMBinding.cpp:
(WebCore::valueToUSVString):
(WebCore::reportException):
(WebCore::reportCurrentException):
(WebCore::setDOMException):
(WebCore::hasIteratorMethod):
(WebCore::toSmallerInt):
(WebCore::toSmallerUInt):
(WebCore::toInt32EnforceRange):
(WebCore::toUInt32EnforceRange):
(WebCore::toInt64EnforceRange):
(WebCore::toUInt64EnforceRange):
(WebCore::throwNotSupportedError):
(WebCore::throwInvalidStateError):
(WebCore::throwSecurityError):
* bindings/js/JSDOMBinding.h:
(WebCore::toJSSequence):
(WebCore::toJS):
(WebCore::jsFrozenArray):
(WebCore::NativeValueTraits<String>::nativeValue):
(WebCore::NativeValueTraits<unsigned>::nativeValue):
(WebCore::NativeValueTraits<float>::nativeValue):
(WebCore::NativeValueTraits<double>::nativeValue):
(WebCore::toNativeArray):
* bindings/js/JSDOMGlobalObject.cpp:
(WebCore::makeThisTypeErrorForBuiltins):
(WebCore::makeGetterTypeErrorForBuiltins):
* bindings/js/JSDOMGlobalObjectTask.cpp:
* bindings/js/JSDOMIterator.h:
(WebCore::iteratorForEach):
* bindings/js/JSDOMPromise.cpp:
(WebCore::rejectPromiseWithExceptionIfAny):
* bindings/js/JSDOMPromise.h:
(WebCore::callPromiseFunction):
* bindings/js/JSDOMStringMapCustom.cpp:
(WebCore::JSDOMStringMap::putDelegate):
* bindings/js/JSDOMWindowBase.cpp:
(WebCore::JSDOMWindowMicrotaskCallback::call):
* bindings/js/JSDOMWindowCustom.cpp:
(WebCore::JSDOMWindow::setLocation):
(WebCore::JSDOMWindow::open):
(WebCore::JSDOMWindow::showModalDialog):
(WebCore::handlePostMessage):
(WebCore::JSDOMWindow::setTimeout):
(WebCore::JSDOMWindow::setInterval):
* bindings/js/JSDataCueCustom.cpp:
(WebCore::constructJSDataCue):
* bindings/js/JSDeviceMotionEventCustom.cpp:
(WebCore::readAccelerationArgument):
(WebCore::readRotationRateArgument):
(WebCore::JSDeviceMotionEvent::initDeviceMotionEvent):
* bindings/js/JSDictionary.cpp:
(WebCore::JSDictionary::tryGetProperty):
(WebCore::JSDictionary::convertValue):
* bindings/js/JSDictionary.h:
(WebCore::JSDictionary::tryGetPropertyAndResult):
* bindings/js/JSDocumentCustom.cpp:
(WebCore::JSDocument::getCSSCanvasContext):
* bindings/js/JSEventListener.cpp:
(WebCore::JSEventListener::handleEvent):
* bindings/js/JSFileCustom.cpp:
(WebCore::constructJSFile):
* bindings/js/JSGeolocationCustom.cpp:
(WebCore::createPositionOptions):
(WebCore::JSGeolocation::getCurrentPosition):
(WebCore::JSGeolocation::watchPosition):
* bindings/js/JSHTMLAllCollectionCustom.cpp:
(WebCore::callHTMLAllCollection):
* bindings/js/JSHTMLCanvasElementCustom.cpp:
(WebCore::get3DContextAttributes):
(WebCore::JSHTMLCanvasElement::getContext):
(WebCore::JSHTMLCanvasElement::probablySupportsContext):
* bindings/js/JSHTMLElementCustom.cpp:
(WebCore::constructJSHTMLElement):
* bindings/js/JSHistoryCustom.cpp:
(WebCore::JSHistory::pushState):
(WebCore::JSHistory::replaceState):
* bindings/js/JSIDBDatabaseCustom.cpp:
(WebCore::JSIDBDatabase::createObjectStore):
* bindings/js/JSLazyEventListener.cpp:
(WebCore::JSLazyEventListener::initializeJSFunction):
* bindings/js/JSMainThreadExecState.h:
(WebCore::JSMainThreadExecState::linkAndEvaluateModule):
(WebCore::JSMainThreadExecState::~JSMainThreadExecState):
* bindings/js/JSMessageEventCustom.cpp:
(WebCore::handleInitMessageEvent):
* bindings/js/JSMessagePortCustom.cpp:
(WebCore::fillMessagePortArray):
* bindings/js/JSMessagePortCustom.h:
(WebCore::handlePostMessage):
* bindings/js/JSMockContentFilterSettingsCustom.cpp:
(WebCore::JSMockContentFilterSettings::setDecisionPoint):
(WebCore::toDecision):
(WebCore::JSMockContentFilterSettings::setDecision):
(WebCore::JSMockContentFilterSettings::setUnblockRequestDecision):
* bindings/js/JSNodeFilterCustom.cpp:
(WebCore::JSNodeFilter::acceptNode):
* bindings/js/JSNodeOrString.cpp:
(WebCore::toNodeOrStringVector):
* bindings/js/JSSQLTransactionCustom.cpp:
(WebCore::JSSQLTransaction::executeSql):
* bindings/js/JSSVGLengthCustom.cpp:
(WebCore::JSSVGLength::convertToSpecifiedUnits):
* bindings/js/JSStorageCustom.cpp:
(WebCore::JSStorage::getOwnPropertyNames):
(WebCore::JSStorage::putDelegate):
* bindings/js/JSTextTrackCustom.cpp:
(WebCore::JSTextTrack::setLanguage):
* bindings/js/JSVideoTrackCustom.cpp:
(WebCore::JSVideoTrack::setKind):
(WebCore::JSVideoTrack::setLanguage):
* bindings/js/JSWebGL2RenderingContextCustom.cpp:
(WebCore::JSWebGL2RenderingContext::getIndexedParameter):
* bindings/js/JSWebGLRenderingContextBaseCustom.cpp:
(WebCore::getObjectParameter):
(WebCore::JSWebGLRenderingContextBase::getExtension):
(WebCore::JSWebGLRenderingContextBase::getFramebufferAttachmentParameter):
(WebCore::JSWebGLRenderingContextBase::getParameter):
(WebCore::JSWebGLRenderingContextBase::getProgramParameter):
(WebCore::JSWebGLRenderingContextBase::getShaderParameter):
(WebCore::toVector):
(WebCore::dataFunctionf):
(WebCore::dataFunctionMatrix):
* bindings/js/JSWebKitSubtleCryptoCustom.cpp:
(WebCore::createAlgorithmFromJSValue):
(WebCore::cryptoKeyFormatFromJSValue):
(WebCore::cryptoKeyUsagesFromJSValue):
(WebCore::JSWebKitSubtleCrypto::encrypt):
(WebCore::JSWebKitSubtleCrypto::decrypt):
(WebCore::JSWebKitSubtleCrypto::sign):
(WebCore::JSWebKitSubtleCrypto::verify):
(WebCore::JSWebKitSubtleCrypto::digest):
(WebCore::JSWebKitSubtleCrypto::generateKey):
(WebCore::importKey):
(WebCore::JSWebKitSubtleCrypto::importKey):
(WebCore::exportKey):
(WebCore::JSWebKitSubtleCrypto::exportKey):
(WebCore::JSWebKitSubtleCrypto::wrapKey):
(WebCore::JSWebKitSubtleCrypto::unwrapKey):
* bindings/js/JSWorkerCustom.cpp:
(WebCore::constructJSWorker):
* bindings/js/JSWorkerGlobalScopeCustom.cpp:
(WebCore::JSWorkerGlobalScope::importScripts):
(WebCore::JSWorkerGlobalScope::setTimeout):
(WebCore::JSWorkerGlobalScope::setInterval):
* bindings/js/ReadableStreamDefaultController.cpp:
(WebCore::ReadableStreamDefaultController::invoke):
(WebCore::ReadableStreamDefaultController::isControlledReadableStreamLocked):
* bindings/js/ReadableStreamDefaultController.h:
(WebCore::ReadableStreamDefaultController::enqueue):
* bindings/js/ScheduledAction.cpp:
(WebCore::ScheduledAction::create):
* bindings/js/ScriptGlobalObject.cpp:
(WebCore::ScriptGlobalObject::set):
* bindings/js/SerializedScriptValue.cpp:
(WebCore::CloneBase::shouldTerminate):
(WebCore::CloneDeserializer::deserialize):
(WebCore::SerializedScriptValue::create):
(WebCore::SerializedScriptValue::deserialize):
* bindings/js/WorkerScriptController.cpp:
(WebCore::WorkerScriptController::evaluate):
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateDictionaryImplementationContent):
(GenerateImplementation):
(GenerateParametersCheck):
(GenerateImplementationFunctionCall):
(GenerateConstructorDefinition):
* bindings/scripts/test/JS/JSTestActiveDOMObject.cpp:
(WebCore::jsTestActiveDOMObjectPrototypeFunctionPostMessage):
* bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp:
(WebCore::jsTestCustomNamedGetterPrototypeFunctionAnotherFunction):
* bindings/scripts/test/JS/JSTestEventConstructor.cpp:
(WebCore::JSTestEventConstructorConstructor::construct):
* bindings/scripts/test/JS/JSTestEventTarget.cpp:
(WebCore::jsTestEventTargetPrototypeFunctionItem):
* bindings/scripts/test/JS/JSTestGlobalObject.cpp:
(WebCore::setJSTestGlobalObjectRegularAttribute):
(WebCore::setJSTestGlobalObjectPublicAndPrivateAttribute):
(WebCore::setJSTestGlobalObjectPublicAndPrivateConditionalAttribute):
(WebCore::setJSTestGlobalObjectEnabledAtRuntimeAttribute):
(WebCore::jsTestGlobalObjectInstanceFunctionRegularOperation):
(WebCore::jsTestGlobalObjectInstanceFunctionEnabledAtRuntimeOperation1):
(WebCore::jsTestGlobalObjectInstanceFunctionEnabledAtRuntimeOperation2):
* bindings/scripts/test/JS/JSTestInterface.cpp:
(WebCore::JSTestInterfaceConstructor::construct):
(WebCore::setJSTestInterfaceConstructorImplementsStaticAttr):
(WebCore::setJSTestInterfaceImplementsStr2):
(WebCore::setJSTestInterfaceImplementsStr3):
(WebCore::setJSTestInterfaceImplementsNode):
(WebCore::setJSTestInterfaceConstructorSupplementalStaticAttr):
(WebCore::setJSTestInterfaceSupplementalStr2):
(WebCore::setJSTestInterfaceSupplementalStr3):
(WebCore::setJSTestInterfaceSupplementalNode):
(WebCore::jsTestInterfacePrototypeFunctionImplementsMethod2):
(WebCore::jsTestInterfacePrototypeFunctionSupplementalMethod2):
* bindings/scripts/test/JS/JSTestJSBuiltinConstructor.cpp:
(WebCore::setJSTestJSBuiltinConstructorTestAttributeRWCustom):
* bindings/scripts/test/JS/JSTestNamedConstructor.cpp:
(WebCore::JSTestNamedConstructorNamedConstructor::construct):
* bindings/scripts/test/JS/JSTestNode.cpp:
(WebCore::setJSTestNodeName):
* bindings/scripts/test/JS/JSTestNondeterministic.cpp:
(WebCore::setJSTestNondeterministicNondeterministicWriteableAttr):
(WebCore::setJSTestNondeterministicNondeterministicExceptionAttr):
(WebCore::setJSTestNondeterministicNondeterministicGetterExceptionAttr):
(WebCore::setJSTestNondeterministicNondeterministicSetterExceptionAttr):
* bindings/scripts/test/JS/JSTestObj.cpp:
(WebCore::convertDictionary<TestObj::Dictionary>):
(WebCore::convertDictionary<TestObj::DictionaryThatShouldNotTolerateNull>):
(WebCore::convertDictionary<TestObj::DictionaryThatShouldTolerateNull>):
(WebCore::convertDictionary<AlternateDictionaryName>):
(WebCore::setJSTestObjConstructorStaticStringAttr):
(WebCore::setJSTestObjTestSubObjEnabledBySettingConstructor):
(WebCore::setJSTestObjEnumAttr):
(WebCore::setJSTestObjByteAttr):
(WebCore::setJSTestObjOctetAttr):
(WebCore::setJSTestObjShortAttr):
(WebCore::setJSTestObjClampedShortAttr):
(WebCore::setJSTestObjEnforceRangeShortAttr):
(WebCore::setJSTestObjUnsignedShortAttr):
(WebCore::setJSTestObjLongAttr):
(WebCore::setJSTestObjLongLongAttr):
(WebCore::setJSTestObjUnsignedLongLongAttr):
(WebCore::setJSTestObjStringAttr):
(WebCore::setJSTestObjUsvstringAttr):
(WebCore::setJSTestObjTestObjAttr):
(WebCore::setJSTestObjTestNullableObjAttr):
(WebCore::setJSTestObjLenientTestObjAttr):
(WebCore::setJSTestObjStringAttrTreatingNullAsEmptyString):
(WebCore::setJSTestObjUsvstringAttrTreatingNullAsEmptyString):
(WebCore::setJSTestObjImplementationEnumAttr):
(WebCore::setJSTestObjXMLObjAttr):
(WebCore::setJSTestObjCreate):
(WebCore::setJSTestObjReflectedStringAttr):
(WebCore::setJSTestObjReflectedUSVStringAttr):
(WebCore::setJSTestObjReflectedIntegralAttr):
(WebCore::setJSTestObjReflectedUnsignedIntegralAttr):
(WebCore::setJSTestObjReflectedBooleanAttr):
(WebCore::setJSTestObjReflectedURLAttr):
(WebCore::setJSTestObjReflectedUSVURLAttr):
(WebCore::setJSTestObjReflectedCustomIntegralAttr):
(WebCore::setJSTestObjReflectedCustomBooleanAttr):
(WebCore::setJSTestObjReflectedCustomURLAttr):
(WebCore::setJSTestObjEnabledAtRuntimeAttribute):
(WebCore::setJSTestObjTypedArrayAttr):
(WebCore::setJSTestObjAttrWithGetterException):
(WebCore::setJSTestObjAttrWithGetterExceptionWithMessage):
(WebCore::setJSTestObjAttrWithSetterException):
(WebCore::setJSTestObjAttrWithSetterExceptionWithMessage):
(WebCore::setJSTestObjStringAttrWithGetterException):
(WebCore::setJSTestObjStringAttrWithSetterException):
(WebCore::setJSTestObjCustomAttr):
(WebCore::setJSTestObjOnfoo):
(WebCore::setJSTestObjOnwebkitfoo):
(WebCore::setJSTestObjWithScriptStateAttribute):
(WebCore::setJSTestObjWithCallWithAndSetterCallWithAttribute):
(WebCore::setJSTestObjWithScriptExecutionContextAttribute):
(WebCore::setJSTestObjWithScriptStateAttributeRaises):
(WebCore::setJSTestObjWithScriptExecutionContextAttributeRaises):
(WebCore::setJSTestObjWithScriptExecutionContextAndScriptStateAttribute):
(WebCore::setJSTestObjWithScriptExecutionContextAndScriptStateAttributeRaises):
(WebCore::setJSTestObjWithScriptExecutionContextAndScriptStateWithSpacesAttribute):
(WebCore::setJSTestObjWithScriptArgumentsAndCallStackAttribute):
(WebCore::setJSTestObjConditionalAttr1):
(WebCore::setJSTestObjConditionalAttr2):
(WebCore::setJSTestObjConditionalAttr3):
(WebCore::setJSTestObjConditionalAttr4Constructor):
(WebCore::setJSTestObjConditionalAttr5Constructor):
(WebCore::setJSTestObjConditionalAttr6Constructor):
(WebCore::setJSTestObjAnyAttribute):
(WebCore::setJSTestObjMutablePoint):
(WebCore::setJSTestObjImmutablePoint):
(WebCore::setJSTestObjStrawberry):
(WebCore::setJSTestObjId):
(WebCore::setJSTestObjReplaceableAttribute):
(WebCore::setJSTestObjNullableLongSettableAttribute):
(WebCore::setJSTestObjNullableStringSettableAttribute):
(WebCore::setJSTestObjNullableUSVStringSettableAttribute):
(WebCore::setJSTestObjNullableStringValue):
(WebCore::setJSTestObjAttributeWithReservedEnumType):
(WebCore::setJSTestObjPutForwardsAttribute):
(WebCore::setJSTestObjPutForwardsNullableAttribute):
(WebCore::setJSTestObjStringifierAttribute):
(WebCore::jsTestObjPrototypeFunctionEnabledAtRuntimeOperation1):
(WebCore::jsTestObjPrototypeFunctionEnabledAtRuntimeOperation2):
(WebCore::jsTestObjPrototypeFunctionVoidMethodWithArgs):
(WebCore::jsTestObjPrototypeFunctionByteMethodWithArgs):
(WebCore::jsTestObjPrototypeFunctionOctetMethodWithArgs):
(WebCore::jsTestObjPrototypeFunctionLongMethodWithArgs):
(WebCore::jsTestObjPrototypeFunctionObjMethodWithArgs):
(WebCore::jsTestObjPrototypeFunctionMethodWithArgTreatingNullAsEmptyString):
(WebCore::jsTestObjPrototypeFunctionMethodWithXPathNSResolverParameter):
(WebCore::jsTestObjPrototypeFunctionNullableStringSpecialMethod):
(WebCore::jsTestObjPrototypeFunctionMethodWithEnumArg):
(WebCore::jsTestObjPrototypeFunctionMethodWithOptionalEnumArg):
(WebCore::jsTestObjPrototypeFunctionMethodWithOptionalEnumArgAndDefaultValue):
(WebCore::jsTestObjPrototypeFunctionMethodThatRequiresAllArgsAndThrows):
(WebCore::jsTestObjPrototypeFunctionMethodWithUSVStringArg):
(WebCore::jsTestObjPrototypeFunctionMethodWithNullableUSVStringArg):
(WebCore::jsTestObjPrototypeFunctionMethodWithUSVStringArgTreatingNullAsEmptyString):
(WebCore::jsTestObjPrototypeFunctionSerializedValue):
(WebCore::jsTestObjPrototypeFunctionPrivateMethod):
(WebCore::jsTestObjPrototypeFunctionPublicAndPrivateMethod):
(WebCore::jsTestObjPrototypeFunctionAddEventListener):
(WebCore::jsTestObjPrototypeFunctionRemoveEventListener):
(WebCore::jsTestObjPrototypeFunctionWithScriptStateObj):
(WebCore::jsTestObjPrototypeFunctionWithScriptStateObjException):
(WebCore::jsTestObjPrototypeFunctionWithScriptExecutionContextAndScriptStateObjException):
(WebCore::jsTestObjPrototypeFunctionWithScriptExecutionContextAndScriptStateWithSpaces):
(WebCore::jsTestObjPrototypeFunctionMethodWithOptionalArg):
(WebCore::jsTestObjPrototypeFunctionMethodWithOptionalArgAndDefaultValue):
(WebCore::jsTestObjPrototypeFunctionMethodWithNonOptionalArgAndOptionalArg):
(WebCore::jsTestObjPrototypeFunctionMethodWithNonOptionalArgAndTwoOptionalArgs):
(WebCore::jsTestObjPrototypeFunctionMethodWithOptionalString):
(WebCore::jsTestObjPrototypeFunctionMethodWithOptionalUSVString):
(WebCore::jsTestObjPrototypeFunctionMethodWithOptionalAtomicString):
(WebCore::jsTestObjPrototypeFunctionMethodWithOptionalStringAndDefaultValue):
(WebCore::jsTestObjPrototypeFunctionMethodWithOptionalAtomicStringAndDefaultValue):
(WebCore::jsTestObjPrototypeFunctionMethodWithOptionalStringIsNull):
(WebCore::jsTestObjPrototypeFunctionMethodWithOptionalStringIsUndefined):
(WebCore::jsTestObjPrototypeFunctionMethodWithOptionalAtomicStringIsNull):
(WebCore::jsTestObjPrototypeFunctionMethodWithOptionalStringIsEmptyString):
(WebCore::jsTestObjPrototypeFunctionMethodWithOptionalUSVStringIsEmptyString):
(WebCore::jsTestObjPrototypeFunctionMethodWithOptionalAtomicStringIsEmptyString):
(WebCore::jsTestObjPrototypeFunctionMethodWithOptionalDoubleIsNaN):
(WebCore::jsTestObjPrototypeFunctionMethodWithOptionalFloatIsNaN):
(WebCore::jsTestObjPrototypeFunctionMethodWithOptionalLongLong):
(WebCore::jsTestObjPrototypeFunctionMethodWithOptionalLongLongIsZero):
(WebCore::jsTestObjPrototypeFunctionMethodWithOptionalUnsignedLongLong):
(WebCore::jsTestObjPrototypeFunctionMethodWithOptionalUnsignedLongLongIsZero):
(WebCore::jsTestObjPrototypeFunctionMethodWithOptionalSequence):
(WebCore::jsTestObjPrototypeFunctionMethodWithOptionalSequenceIsEmpty):
(WebCore::jsTestObjPrototypeFunctionMethodWithOptionalBoolean):
(WebCore::jsTestObjPrototypeFunctionMethodWithOptionalBooleanIsFalse):
(WebCore::jsTestObjPrototypeFunctionMethodWithOptionalXPathNSResolver):
(WebCore::jsTestObjPrototypeFunctionMethodWithNonCallbackArgAndCallbackArg):
(WebCore::jsTestObjPrototypeFunctionMethodWithNonCallbackArgAndCallbackFunctionArg):
(WebCore::jsTestObjPrototypeFunctionOverloadedMethod1):
(WebCore::jsTestObjPrototypeFunctionOverloadedMethod2):
(WebCore::jsTestObjPrototypeFunctionOverloadedMethod3):
(WebCore::jsTestObjPrototypeFunctionOverloadedMethod4):
(WebCore::jsTestObjPrototypeFunctionOverloadedMethod7):
(WebCore::jsTestObjPrototypeFunctionOverloadedMethod9):
(WebCore::jsTestObjPrototypeFunctionOverloadedMethod10):
(WebCore::jsTestObjPrototypeFunctionOverloadedMethod11):
(WebCore::jsTestObjPrototypeFunctionOverloadedMethodWithOptionalParameter1):
(WebCore::jsTestObjPrototypeFunctionOverloadedMethodWithOptionalParameter2):
(WebCore::jsTestObjConstructorFunctionClassMethodWithOptional):
(WebCore::jsTestObjConstructorFunctionOverloadedMethod11):
(WebCore::jsTestObjConstructorFunctionOverloadedMethod12):
(WebCore::jsTestObjPrototypeFunctionClassMethodWithClamp):
(WebCore::jsTestObjPrototypeFunctionClassMethodWithEnforceRange):
(WebCore::jsTestObjPrototypeFunctionMethodWithUnsignedLongSequence):
(WebCore::jsTestObjPrototypeFunctionStringArrayFunction):
(WebCore::jsTestObjPrototypeFunctionMethodWithAndWithoutNullableSequence):
(WebCore::jsTestObjPrototypeFunctionGetElementById):
(WebCore::jsTestObjPrototypeFunctionConvert3):
(WebCore::jsTestObjPrototypeFunctionConvert4):
(WebCore::jsTestObjPrototypeFunctionVariadicStringMethod):
(WebCore::jsTestObjPrototypeFunctionVariadicDoubleMethod):
(WebCore::jsTestObjPrototypeFunctionAny):
(WebCore::jsTestObjPrototypeFunctionTestPromiseFunctionWithFloatArgumentPromise):
(WebCore::jsTestObjPrototypeFunctionTestPromiseFunctionWithOptionalIntArgumentPromise):
(WebCore::jsTestObjPrototypeFunctionTestPromiseOverloadedFunction1Promise):
(WebCore::jsTestObjPrototypeFunctionConditionalOverload1):
(WebCore::jsTestObjPrototypeFunctionConditionalOverload2):
(WebCore::jsTestObjPrototypeFunctionSingleConditionalOverload1):
(WebCore::jsTestObjPrototypeFunctionSingleConditionalOverload2):
(WebCore::jsTestObjPrototypeFunctionAttachShadowRoot):
* bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp:
(WebCore::constructJSTestOverloadedConstructors1):
(WebCore::constructJSTestOverloadedConstructors2):
(WebCore::constructJSTestOverloadedConstructors4):
(WebCore::constructJSTestOverloadedConstructors5):
* bindings/scripts/test/JS/JSTestOverloadedConstructorsWithSequence.cpp:
(WebCore::constructJSTestOverloadedConstructorsWithSequence1):
(WebCore::constructJSTestOverloadedConstructorsWithSequence2):
* bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp:
(WebCore::jsTestOverrideBuiltinsPrototypeFunctionNamedItem):
* bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp:
(WebCore::setJSTestSerializedScriptValueInterfaceValue):
(WebCore::setJSTestSerializedScriptValueInterfaceCachedValue):
* bindings/scripts/test/JS/JSTestTypedefs.cpp:
(WebCore::JSTestTypedefsConstructor::construct):
(WebCore::setJSTestTypedefsUnsignedLongLongAttr):
(WebCore::setJSTestTypedefsImmutableSerializedScriptValue):
(WebCore::setJSTestTypedefsAttrWithGetterException):
(WebCore::setJSTestTypedefsAttrWithSetterException):
(WebCore::setJSTestTypedefsStringAttrWithGetterException):
(WebCore::setJSTestTypedefsStringAttrWithSetterException):
(WebCore::jsTestTypedefsPrototypeFunctionFunc):
(WebCore::jsTestTypedefsPrototypeFunctionSetShadow):
(WebCore::jsTestTypedefsPrototypeFunctionMethodWithSequenceArg):
(WebCore::jsTestTypedefsPrototypeFunctionNullableSequenceArg):
(WebCore::jsTestTypedefsPrototypeFunctionFuncWithClamp):
(WebCore::jsTestTypedefsPrototypeFunctionStringSequenceFunction):
(WebCore::jsTestTypedefsPrototypeFunctionStringSequenceFunction2):
(WebCore::jsTestTypedefsPrototypeFunctionCallWithSequenceThatRequiresInclude):
* bridge/NP_jsobject.cpp:
(_NPN_InvokeDefault):
(_NPN_Invoke):
(_NPN_Evaluate):
(_NPN_GetProperty):
(_NPN_SetProperty):
(_NPN_RemoveProperty):
(_NPN_HasProperty):
(_NPN_HasMethod):
(_NPN_Enumerate):
(_NPN_Construct):
* bridge/c/c_instance.cpp:
(JSC::Bindings::CInstance::moveGlobalExceptionToExecState):
* bridge/objc/WebScriptObject.mm:
(WebCore::addExceptionToConsole):
(-[WebScriptObject callWebScriptMethod:withArguments:]):
(-[WebScriptObject evaluateWebScript:]):
(-[WebScriptObject setValue:forKey:]):
(-[WebScriptObject valueForKey:]):
(-[WebScriptObject removeWebScriptKey:]):
(-[WebScriptObject hasWebScriptKey:]):
(-[WebScriptObject webScriptValueAtIndex:]):
(-[WebScriptObject setWebScriptValueAtIndex:value:]):
* contentextensions/ContentExtensionParser.cpp:
(WebCore::ContentExtensions::getDomainList):
(WebCore::ContentExtensions::getTypeFlags):
(WebCore::ContentExtensions::loadTrigger):
(WebCore::ContentExtensions::loadAction):
(WebCore::ContentExtensions::loadEncodedRules):
* html/HTMLMediaElement.cpp:
(WebCore::controllerJSValue):
(WebCore::HTMLMediaElement::updateCaptionContainer):
(WebCore::HTMLMediaElement::ensureMediaControlsInjectedScript):
(WebCore::HTMLMediaElement::didAddUserAgentShadowRoot):
(WebCore::HTMLMediaElement::updateMediaControlsAfterPresentationModeChange):
(WebCore::HTMLMediaElement::getCurrentMediaControlsStatus):
* html/HTMLPlugInImageElement.cpp:
(WebCore::HTMLPlugInImageElement::didAddUserAgentShadowRoot):
Source/WebKit/mac:
* Plugins/Hosted/NetscapePluginInstanceProxy.mm:
(WebKit::NetscapePluginInstanceProxy::evaluate):
(WebKit::NetscapePluginInstanceProxy::invoke):
(WebKit::NetscapePluginInstanceProxy::invokeDefault):
(WebKit::NetscapePluginInstanceProxy::construct):
(WebKit::NetscapePluginInstanceProxy::getProperty):
(WebKit::NetscapePluginInstanceProxy::setProperty):
(WebKit::NetscapePluginInstanceProxy::removeProperty):
(WebKit::NetscapePluginInstanceProxy::hasProperty):
(WebKit::NetscapePluginInstanceProxy::hasMethod):
(WebKit::NetscapePluginInstanceProxy::enumerate):
* WebView/WebView.mm:
(aeDescFromJSValue):
Source/WebKit/win:
* Plugins/PluginPackage.cpp:
(WebCore::NPN_Evaluate):
(WebCore::NPN_Invoke):
Source/WebKit2:
* WebProcess/Plugins/Netscape/NPJSObject.cpp:
(WebKit::NPJSObject::hasMethod):
(WebKit::NPJSObject::hasProperty):
(WebKit::NPJSObject::getProperty):
(WebKit::NPJSObject::setProperty):
(WebKit::NPJSObject::removeProperty):
(WebKit::NPJSObject::construct):
(WebKit::NPJSObject::invoke):
Source/WTF:
* wtf/Platform.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreAPIAPIUtilsh">trunk/Source/JavaScriptCore/API/APIUtils.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreCMakeListstxt">trunk/Source/JavaScriptCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceJavaScriptCorebindingsScriptFunctionCallcpp">trunk/Source/JavaScriptCore/bindings/ScriptFunctionCall.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebindingsScriptValuecpp">trunk/Source/JavaScriptCore/bindings/ScriptValue.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredebuggerDebuggercpp">trunk/Source/JavaScriptCore/debugger/Debugger.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredebuggerDebuggerCallFramecpp">trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGOSRExitCompilercpp">trunk/Source/JavaScriptCore/dfg/DFGOSRExitCompiler.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGOperationscpp">trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInjectedScriptManagercpp">trunk/Source/JavaScriptCore/inspector/InjectedScriptManager.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSGlobalObjectInspectorControllercpp">trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSInjectedScriptHostcpp">trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSJavaScriptCallFramecpp">trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorScriptCallStackFactorycpp">trunk/Source/JavaScriptCore/inspector/ScriptCallStackFactory.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterCachedCallh">trunk/Source/JavaScriptCore/interpreter/CachedCall.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterCallFrameh">trunk/Source/JavaScriptCore/interpreter/CallFrame.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterInterpretercpp">trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterInterpreterh">trunk/Source/JavaScriptCore/interpreter/Interpreter.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterShadowChickencpp">trunk/Source/JavaScriptCore/interpreter/ShadowChicken.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITCodecpp">trunk/Source/JavaScriptCore/jit/JITCode.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITExceptionscpp">trunk/Source/JavaScriptCore/jit/JITExceptions.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITOperationscpp">trunk/Source/JavaScriptCore/jit/JITOperations.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejsccpp">trunk/Source/JavaScriptCore/jsc.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLLIntExceptionscpp">trunk/Source/JavaScriptCore/llint/LLIntExceptions.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLLIntSlowPathscpp">trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreprofilerProfilerBytecodeSequencecpp">trunk/Source/JavaScriptCore/profiler/ProfilerBytecodeSequence.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreprofilerProfilerCompilationcpp">trunk/Source/JavaScriptCore/profiler/ProfilerCompilation.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreprofilerProfilerDatabasecpp">trunk/Source/JavaScriptCore/profiler/ProfilerDatabase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreprofilerProfilerOSRExitSitecpp">trunk/Source/JavaScriptCore/profiler/ProfilerOSRExitSite.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreprofilerProfilerOriginStackcpp">trunk/Source/JavaScriptCore/profiler/ProfilerOriginStack.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeArrayPrototypecpp">trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeBooleanConstructorcpp">trunk/Source/JavaScriptCore/runtime/BooleanConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCallDatacpp">trunk/Source/JavaScriptCore/runtime/CallData.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCommonSlowPathscpp">trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCommonSlowPathsh">trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCommonSlowPathsExceptionscpp">trunk/Source/JavaScriptCore/runtime/CommonSlowPathsExceptions.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCompletioncpp">trunk/Source/JavaScriptCore/runtime/Completion.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeConsoleObjectcpp">trunk/Source/JavaScriptCore/runtime/ConsoleObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeDateConstructorcpp">trunk/Source/JavaScriptCore/runtime/DateConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeDatePrototypecpp">trunk/Source/JavaScriptCore/runtime/DatePrototype.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeErrorConstructorcpp">trunk/Source/JavaScriptCore/runtime/ErrorConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeErrorInstancecpp">trunk/Source/JavaScriptCore/runtime/ErrorInstance.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeErrorPrototypecpp">trunk/Source/JavaScriptCore/runtime/ErrorPrototype.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeExceptionHelpersh">trunk/Source/JavaScriptCore/runtime/ExceptionHelpers.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeFunctionConstructorcpp">trunk/Source/JavaScriptCore/runtime/FunctionConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeFunctionPrototypecpp">trunk/Source/JavaScriptCore/runtime/FunctionPrototype.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeGenericArgumentsInlinesh">trunk/Source/JavaScriptCore/runtime/GenericArgumentsInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeGetterSettercpp">trunk/Source/JavaScriptCore/runtime/GetterSetter.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeInspectorInstrumentationObjectcpp">trunk/Source/JavaScriptCore/runtime/InspectorInstrumentationObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeInternalFunctioncpp">trunk/Source/JavaScriptCore/runtime/InternalFunction.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIntlCollatorcpp">trunk/Source/JavaScriptCore/runtime/IntlCollator.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIntlCollatorConstructorcpp">trunk/Source/JavaScriptCore/runtime/IntlCollatorConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIntlCollatorPrototypecpp">trunk/Source/JavaScriptCore/runtime/IntlCollatorPrototype.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIntlDateTimeFormatcpp">trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIntlDateTimeFormatConstructorcpp">trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormatConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIntlDateTimeFormatPrototypecpp">trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormatPrototype.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIntlNumberFormatcpp">trunk/Source/JavaScriptCore/runtime/IntlNumberFormat.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIntlNumberFormatConstructorcpp">trunk/Source/JavaScriptCore/runtime/IntlNumberFormatConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIntlNumberFormatPrototypecpp">trunk/Source/JavaScriptCore/runtime/IntlNumberFormatPrototype.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIntlObjectcpp">trunk/Source/JavaScriptCore/runtime/IntlObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIntlObjectInlinesh">trunk/Source/JavaScriptCore/runtime/IntlObjectInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIteratorOperationscpp">trunk/Source/JavaScriptCore/runtime/IteratorOperations.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIteratorOperationsh">trunk/Source/JavaScriptCore/runtime/IteratorOperations.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSArraycpp">trunk/Source/JavaScriptCore/runtime/JSArray.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSArrayBufferConstructorcpp">trunk/Source/JavaScriptCore/runtime/JSArrayBufferConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSArrayBufferPrototypecpp">trunk/Source/JavaScriptCore/runtime/JSArrayBufferPrototype.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSArrayInlinesh">trunk/Source/JavaScriptCore/runtime/JSArrayInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSBoundFunctioncpp">trunk/Source/JavaScriptCore/runtime/JSBoundFunction.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSCJSValuecpp">trunk/Source/JavaScriptCore/runtime/JSCJSValue.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSCJSValueInlinesh">trunk/Source/JavaScriptCore/runtime/JSCJSValueInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSDataViewPrototypecpp">trunk/Source/JavaScriptCore/runtime/JSDataViewPrototype.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSFunctioncpp">trunk/Source/JavaScriptCore/runtime/JSFunction.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGenericTypedArrayViewh">trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGenericTypedArrayViewConstructorInlinesh">trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewConstructorInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGenericTypedArrayViewPrototypeFunctionsh">trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjecth">trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjectFunctionscpp">trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSJobcpp">trunk/Source/JavaScriptCore/runtime/JSJob.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSModuleEnvironmentcpp">trunk/Source/JavaScriptCore/runtime/JSModuleEnvironment.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSModuleLoadercpp">trunk/Source/JavaScriptCore/runtime/JSModuleLoader.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSModuleNamespaceObjectcpp">trunk/Source/JavaScriptCore/runtime/JSModuleNamespaceObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSModuleRecordcpp">trunk/Source/JavaScriptCore/runtime/JSModuleRecord.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSONObjectcpp">trunk/Source/JavaScriptCore/runtime/JSONObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSObjectcpp">trunk/Source/JavaScriptCore/runtime/JSObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSObjectInlinesh">trunk/Source/JavaScriptCore/runtime/JSObjectInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSPromiseConstructorcpp">trunk/Source/JavaScriptCore/runtime/JSPromiseConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSPropertyNameEnumeratorh">trunk/Source/JavaScriptCore/runtime/JSPropertyNameEnumerator.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSPropertyNameIteratorcpp">trunk/Source/JavaScriptCore/runtime/JSPropertyNameIterator.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSScopecpp">trunk/Source/JavaScriptCore/runtime/JSScope.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSStringcpp">trunk/Source/JavaScriptCore/runtime/JSString.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSStringJoinercpp">trunk/Source/JavaScriptCore/runtime/JSStringJoiner.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeLiteralParsercpp">trunk/Source/JavaScriptCore/runtime/LiteralParser.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeMapConstructorcpp">trunk/Source/JavaScriptCore/runtime/MapConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeMathObjectcpp">trunk/Source/JavaScriptCore/runtime/MathObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeModuleLoaderPrototypecpp">trunk/Source/JavaScriptCore/runtime/ModuleLoaderPrototype.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeNativeErrorConstructorcpp">trunk/Source/JavaScriptCore/runtime/NativeErrorConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeNumberConstructorcpp">trunk/Source/JavaScriptCore/runtime/NumberConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeObjectConstructorcpp">trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeObjectConstructorh">trunk/Source/JavaScriptCore/runtime/ObjectConstructor.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeObjectPrototypecpp">trunk/Source/JavaScriptCore/runtime/ObjectPrototype.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeOperationscpp">trunk/Source/JavaScriptCore/runtime/Operations.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeOptionsh">trunk/Source/JavaScriptCore/runtime/Options.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimePropertyDescriptorcpp">trunk/Source/JavaScriptCore/runtime/PropertyDescriptor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeProxyConstructorcpp">trunk/Source/JavaScriptCore/runtime/ProxyConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeProxyObjectcpp">trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeReflectObjectcpp">trunk/Source/JavaScriptCore/runtime/ReflectObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeRegExpConstructorcpp">trunk/Source/JavaScriptCore/runtime/RegExpConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeRegExpConstructorh">trunk/Source/JavaScriptCore/runtime/RegExpConstructor.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeRegExpObjectcpp">trunk/Source/JavaScriptCore/runtime/RegExpObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeRegExpPrototypecpp">trunk/Source/JavaScriptCore/runtime/RegExpPrototype.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeSetConstructorcpp">trunk/Source/JavaScriptCore/runtime/SetConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeStringConstructorcpp">trunk/Source/JavaScriptCore/runtime/StringConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeStringObjectcpp">trunk/Source/JavaScriptCore/runtime/StringObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeStringPrototypecpp">trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeSymbolConstructorcpp">trunk/Source/JavaScriptCore/runtime/SymbolConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeTemplateRegistrycpp">trunk/Source/JavaScriptCore/runtime/TemplateRegistry.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeThrowScopecpp">trunk/Source/JavaScriptCore/runtime/ThrowScope.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeThrowScopeh">trunk/Source/JavaScriptCore/runtime/ThrowScope.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeVMcpp">trunk/Source/JavaScriptCore/runtime/VM.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeVMh">trunk/Source/JavaScriptCore/runtime/VM.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeWeakMapConstructorcpp">trunk/Source/JavaScriptCore/runtime/WeakMapConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeWeakSetConstructorcpp">trunk/Source/JavaScriptCore/runtime/WeakSetConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoretoolsJSDollarVMPrototypecpp">trunk/Source/JavaScriptCore/tools/JSDollarVMPrototype.cpp</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaCDMSessionClearKeycpp">trunk/Source/WebCore/Modules/encryptedmedia/CDMSessionClearKey.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBObjectStorecpp">trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabasecpp">trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamSDPProcessorcpp">trunk/Source/WebCore/Modules/mediastream/SDPProcessor.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulespluginsQuickTimePluginReplacementmm">trunk/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsjsArrayValuecpp">trunk/Source/WebCore/bindings/js/ArrayValue.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsDictionarycpp">trunk/Source/WebCore/bindings/js/Dictionary.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsIDBBindingUtilitiescpp">trunk/Source/WebCore/bindings/js/IDBBindingUtilities.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSApplePaySessionCustomcpp">trunk/Source/WebCore/bindings/js/JSApplePaySessionCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSAudioTrackCustomcpp">trunk/Source/WebCore/bindings/js/JSAudioTrackCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSBlobCustomcpp">trunk/Source/WebCore/bindings/js/JSBlobCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCSSStyleDeclarationCustomcpp">trunk/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCommandLineAPIHostCustomcpp">trunk/Source/WebCore/bindings/js/JSCommandLineAPIHostCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCryptoAlgorithmDictionarycpp">trunk/Source/WebCore/bindings/js/JSCryptoAlgorithmDictionary.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCryptoKeySerializationJWKcpp">trunk/Source/WebCore/bindings/js/JSCryptoKeySerializationJWK.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCustomElementInterfacecpp">trunk/Source/WebCore/bindings/js/JSCustomElementInterface.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCustomElementRegistryCustomcpp">trunk/Source/WebCore/bindings/js/JSCustomElementRegistryCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMBindingcpp">trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMBindingh">trunk/Source/WebCore/bindings/js/JSDOMBinding.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMGlobalObjectcpp">trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMGlobalObjectTaskcpp">trunk/Source/WebCore/bindings/js/JSDOMGlobalObjectTask.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMIteratorh">trunk/Source/WebCore/bindings/js/JSDOMIterator.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMPromisecpp">trunk/Source/WebCore/bindings/js/JSDOMPromise.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMPromiseh">trunk/Source/WebCore/bindings/js/JSDOMPromise.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMStringMapCustomcpp">trunk/Source/WebCore/bindings/js/JSDOMStringMapCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMWindowBasecpp">trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMWindowCustomcpp">trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDataCueCustomcpp">trunk/Source/WebCore/bindings/js/JSDataCueCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDeviceMotionEventCustomcpp">trunk/Source/WebCore/bindings/js/JSDeviceMotionEventCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDictionarycpp">trunk/Source/WebCore/bindings/js/JSDictionary.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDictionaryh">trunk/Source/WebCore/bindings/js/JSDictionary.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDocumentCustomcpp">trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSEventListenercpp">trunk/Source/WebCore/bindings/js/JSEventListener.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSFileCustomcpp">trunk/Source/WebCore/bindings/js/JSFileCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSGeolocationCustomcpp">trunk/Source/WebCore/bindings/js/JSGeolocationCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSHTMLAllCollectionCustomcpp">trunk/Source/WebCore/bindings/js/JSHTMLAllCollectionCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSHTMLCanvasElementCustomcpp">trunk/Source/WebCore/bindings/js/JSHTMLCanvasElementCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSHTMLElementCustomcpp">trunk/Source/WebCore/bindings/js/JSHTMLElementCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSHistoryCustomcpp">trunk/Source/WebCore/bindings/js/JSHistoryCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSIDBDatabaseCustomcpp">trunk/Source/WebCore/bindings/js/JSIDBDatabaseCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSLazyEventListenercpp">trunk/Source/WebCore/bindings/js/JSLazyEventListener.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSMainThreadExecStateh">trunk/Source/WebCore/bindings/js/JSMainThreadExecState.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSMessageEventCustomcpp">trunk/Source/WebCore/bindings/js/JSMessageEventCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSMessagePortCustomcpp">trunk/Source/WebCore/bindings/js/JSMessagePortCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSMessagePortCustomh">trunk/Source/WebCore/bindings/js/JSMessagePortCustom.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSMockContentFilterSettingsCustomcpp">trunk/Source/WebCore/bindings/js/JSMockContentFilterSettingsCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSNodeFilterCustomcpp">trunk/Source/WebCore/bindings/js/JSNodeFilterCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSNodeOrStringcpp">trunk/Source/WebCore/bindings/js/JSNodeOrString.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSSQLTransactionCustomcpp">trunk/Source/WebCore/bindings/js/JSSQLTransactionCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSSVGLengthCustomcpp">trunk/Source/WebCore/bindings/js/JSSVGLengthCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSStorageCustomcpp">trunk/Source/WebCore/bindings/js/JSStorageCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSTextTrackCustomcpp">trunk/Source/WebCore/bindings/js/JSTextTrackCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSVideoTrackCustomcpp">trunk/Source/WebCore/bindings/js/JSVideoTrackCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSWebGL2RenderingContextCustomcpp">trunk/Source/WebCore/bindings/js/JSWebGL2RenderingContextCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSWebGLRenderingContextBaseCustomcpp">trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextBaseCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSWebKitSubtleCryptoCustomcpp">trunk/Source/WebCore/bindings/js/JSWebKitSubtleCryptoCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSWorkerCustomcpp">trunk/Source/WebCore/bindings/js/JSWorkerCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSWorkerGlobalScopeCustomcpp">trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsReadableStreamDefaultControllercpp">trunk/Source/WebCore/bindings/js/ReadableStreamDefaultController.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsReadableStreamDefaultControllerh">trunk/Source/WebCore/bindings/js/ReadableStreamDefaultController.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsScheduledActioncpp">trunk/Source/WebCore/bindings/js/ScheduledAction.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsScriptGlobalObjectcpp">trunk/Source/WebCore/bindings/js/ScriptGlobalObject.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsSerializedScriptValuecpp">trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsWorkerScriptControllercpp">trunk/Source/WebCore/bindings/js/WorkerScriptController.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestActiveDOMObjectcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestCustomNamedGettercpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestEventConstructorcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestEventTargetcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestGlobalObjectcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGlobalObject.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestInterfacecpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestJSBuiltinConstructorcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestJSBuiltinConstructor.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestNamedConstructorcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestNodecpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNode.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestNondeterministiccpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNondeterministic.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestOverloadedConstructorscpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestOverloadedConstructorsWithSequencecpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructorsWithSequence.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestOverrideBuiltinscpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestSerializedScriptValueInterfacecpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestTypedefscpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp</a></li>
<li><a href="#trunkSourceWebCorebridgeNP_jsobjectcpp">trunk/Source/WebCore/bridge/NP_jsobject.cpp</a></li>
<li><a href="#trunkSourceWebCorebridgecc_instancecpp">trunk/Source/WebCore/bridge/c/c_instance.cpp</a></li>
<li><a href="#trunkSourceWebCorebridgeobjcWebScriptObjectmm">trunk/Source/WebCore/bridge/objc/WebScriptObject.mm</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsContentExtensionParsercpp">trunk/Source/WebCore/contentextensions/ContentExtensionParser.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLPlugInImageElementcpp">trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacPluginsHostedNetscapePluginInstanceProxymm">trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinPluginsPluginPackagecpp">trunk/Source/WebKit/win/Plugins/PluginPackage.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapeNPJSObjectcpp">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreruntimeCatchScopecpp">trunk/Source/JavaScriptCore/runtime/CatchScope.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCatchScopeh">trunk/Source/JavaScriptCore/runtime/CatchScope.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeExceptionEventLocationcpp">trunk/Source/JavaScriptCore/runtime/ExceptionEventLocation.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeExceptionEventLocationh">trunk/Source/JavaScriptCore/runtime/ExceptionEventLocation.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeExceptionScopecpp">trunk/Source/JavaScriptCore/runtime/ExceptionScope.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeExceptionScopeh">trunk/Source/JavaScriptCore/runtime/ExceptionScope.h</a></li>
<li><a href="#trunkSourceWebCoreForwardingHeadersruntimeCatchScopeh">trunk/Source/WebCore/ForwardingHeaders/runtime/CatchScope.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreruntimeThrowScopeLocationh">trunk/Source/JavaScriptCore/runtime/ThrowScopeLocation.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreAPIAPIUtilsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/APIUtils.h (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/APIUtils.h 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/API/APIUtils.h 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -38,11 +38,13 @@
</span><span class="cx">
</span><span class="cx"> inline ExceptionStatus handleExceptionIfNeeded(JSC::ExecState* exec, JSValueRef* returnedExceptionRef)
</span><span class="cx"> {
</span><del>- if (exec->hadException()) {
- JSC::Exception* exception = exec->exception();
</del><ins>+ JSC::VM& vm = exec->vm();
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+ if (UNLIKELY(scope.exception())) {
+ JSC::Exception* exception = scope.exception();
</ins><span class="cx"> if (returnedExceptionRef)
</span><span class="cx"> *returnedExceptionRef = toRef(exec, exception->value());
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> #if ENABLE(REMOTE_INSPECTOR)
</span><span class="cx"> exec->vmEntryGlobalObject()->inspectorController().reportAPIException(exec, exception);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -631,6 +631,7 @@
</span><span class="cx"> runtime/BooleanObject.cpp
</span><span class="cx"> runtime/BooleanPrototype.cpp
</span><span class="cx"> runtime/CallData.cpp
</span><ins>+ runtime/CatchScope.cpp
</ins><span class="cx"> runtime/ClonedArguments.cpp
</span><span class="cx"> runtime/CodeCache.cpp
</span><span class="cx"> runtime/CodeSpecializationKind.cpp
</span><span class="lines">@@ -660,8 +661,11 @@
</span><span class="cx"> runtime/ErrorInstance.cpp
</span><span class="cx"> runtime/ErrorPrototype.cpp
</span><span class="cx"> runtime/Exception.cpp
</span><ins>+ runtime/ExceptionEvent.cpp
+ runtime/ExceptionEventLocation.cpp
</ins><span class="cx"> runtime/ExceptionFuzz.cpp
</span><span class="cx"> runtime/ExceptionHelpers.cpp
</span><ins>+ runtime/ExceptionScope.cpp
</ins><span class="cx"> runtime/Executable.cpp
</span><span class="cx"> runtime/FunctionConstructor.cpp
</span><span class="cx"> runtime/FunctionExecutableDump.cpp
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -1,3 +1,751 @@
</span><ins>+2016-09-07 Mark Lam <mark.lam@apple.com>
+
+ Add CatchScope and force all exception checks to be via ThrowScope or CatchScope.
+ https://bugs.webkit.org/show_bug.cgi?id=161498
+
+ Reviewed by Geoffrey Garen.
+
+ This patch refactors the ThrowScope class, and introduces a base ExceptionScope
+ that ThrowScope extends. A CatchScope which extends the ExceptionScope is also
+ introduced.
+
+ ENABLE(THROW_SCOPE_VERIFICATION) is now renamed to ENABLE(EXCEPTION_SCOPE_VERIFICATION)
+ which is a more suitable name now.
+
+ Note: exception scope verification is still disabled by default. There are still
+ many places that need to be fixed up or re-expressed in a way that is friendly
+ to the verification. I'll address those in subsequent patches.
+
+ After this patch, the code will statically enforce that:
+ 1. all calls to throwException() go through a ThrowScope.
+ 2. all calls to clearException() go through a CatchScope.
+ 3. all exception checks go through an ExceptionScope in the form of a ThrowScope
+ or CatchScope.
+
+ A Summary of how to use ExceptionScopes
+ =======================================
+ 1. If a function can throw a JS exception, it should declare a ThrowScope at the
+ top of the function (as early as possible).
+
+ 2. If a function can clear JS exceptions, it should declare a CatchScope at the
+ top of the function (as early as possible).
+
+ Declaring a ThrowScope in a function means that the function may throw an exception
+ that its caller will have to handle. Declaring a CatchScope in a function means
+ that the function intends to clear pending exceptions before returning to its
+ caller.
+
+ For more details, see the notes below.
+
+ Everything you may want to know about ExceptionScopes
+ =====================================================
+ ExceptionScope verification works to simulate exception throws and detect cases
+ where exception checks are missing. The notes below will cover:
+
+ 1. The VM::m_needExceptionCheck bit
+ 2. ThrowScopes and CatchScopes
+ 3. Verification of needed exception checks
+ 3. Checking Exceptions
+ 4. Simulating throws
+ 5. Using ThrowScope::release()
+ 6. Checking exceptions with ThrowScope::exception() / CatchScope::exception()
+ 7. Checking exceptions by checking callee results
+ 8. Debugging verification errors
+
+ 1. The VM::m_needExceptionCheck bit
+
+ The VM has a m_needExceptionCheck bit that indicates when an exception may be
+ thrown. You can think of the m_needExceptionCheck bit being set as a simulated
+ throw.
+
+ 2. ThrowScopes and CatchScopes
+
+ Only ThrowScopes may throwException. Only CatchScopes may catchException.
+
+ Every throw site must declare a ThrowScope instance using DECLARE_THROW_SCOPE
+ at the top of its function (as early as possible) e.g.
+
+ void foo(...)
+ {
+ auto scope = DECLARE_THROW_SCOPE(vm);
+ ...
+ throwException(exec, scope, ...);
+ }
+
+ Note: by convention, every throw helper function must take a ThrowScope argument
+ instead of instantiating its own ThrowScope. This allows the throw to be
+ attributed to the client code rather than the throw helper itself.
+
+ Every catch site (i.e. a site that calls clearException()) must declare a
+ CatchScope instance using DECLARE_CATCH_SCOPE at the top of its function.
+
+ If a function can both throw or clear exceptions, then the ThrowScope should
+ be declared first so that it can simulate a throw to the function's caller.
+
+ Note: ThrowScope and CatchScope both extend ExceptionScope so that ThrowScopes
+ can be aware if there's an enclosing CatchScope between it and the point where
+ C++ code returns to JS code. This is needed to determine if the ThrowScope
+ should simulate a re-throw or not. See (4) below for more details on returning
+ to JS code.
+
+ 3. Verification of needed exception checks
+
+ a. On construction, each ThrowScope and CatchScope will verify that
+ VM::m_needExceptionCheck is not set.
+
+ This ensures that the caller of the current function has checked for exceptions
+ where needed before doing more work which lead to calling the current function.
+
+ b. On destruction, each ThrowScope and CatchScope will verify that
+ VM::m_needExceptionCheck is not set. This verification will be skipped if
+ the ThrowScope has been released (see (5) below).
+
+ This ensures that the function that owns this exception scope is not missing
+ any exception checks before returning.
+
+ c. When throwing an exception, the ThrowScope will verify that VM::m_needExceptionCheck
+ is not already set, unless it's been ask to rethrow the same Exception object.
+
+ 4. Simulating throws
+
+ Throws are simulated by setting the m_needExceptionCheck bit.
+
+ The bit will only be set in the ThrowScope destructor except when the ThrowScope
+ detects the caller is a LLInt or JIT function. LLInt or JIT functions will always
+ check for exceptions after a host C++ function returns to it. However, they will
+ not clear the m_needExceptionCheck bit.
+
+ Hence, if the ThrowScope destructor detects the caller is a LLInt or JIT function,
+ it will just skip the setting of the bit.
+
+ Note: it is not needed nor correct to set the m_needExceptionCheck bit in the
+ throwException methods. This is because, in practice, we always return
+ immediately after throwing an exception. It doesn't make sense to set the bit in
+ the throw just to have to clear it immediately after before we do verification in
+ the ThrowScope destructor.
+
+ 5. Using ThrowScope::release()
+
+ Calling release() means that the scope is released from its obligation to
+ verify the VM::m_needExceptionCheck bit on destruction.
+
+ release() should only be used at the bottom of a function if:
+
+ a. This function is going to let its caller check and handle the exception, e.g.
+
+ void foo(...)
+ {
+ auto scope = DECLARE_THROW_SCOPE(vm);
+ auto result = goo(); // may throw.
+
+ ... // Code that will are not affected by a pending exceptions.
+
+ scope.release(); // tell the ThrowScope that the caller will handle the exception.
+ return result;
+ }
+
+ b. This function is going to do a tail call that may throw.
+
+ void foo(...)
+ {
+ auto scope = DECLARE_THROW_SCOPE(vm);
+ ...
+ scope.release(); // tell the ThrowScope that the caller will handle the exception.
+ return goo(); // may throw.
+ }
+
+ release() should not be used in code paths that branch. For example:
+
+ void foo(...)
+ {
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
+ auto result = goo1(); // may throw.
+ scope.release(); // WRONG !!! Don't do this.
+ if (result)
+ return;
+
+ result = goo2(); // may throw.
+ ...
+ return result;
+ }
+
+ The above will result in a verification error in goo2()'s ThrowScope. The
+ proper way to fix this verification is to do either (6) or (7) below.
+
+ 6. Checking exceptions with ThrowScope::exception() / CatchScope::exception()
+
+ ThrowScope/CatchScope::exception() returns the thrown Exception object if
+ there is one pending. Else, it returns nullptr.
+
+ It also clears the m_needExceptionCheck bit thereby indicating that we've
+ satisfied the needed exception check. For example,
+
+ void foo(...)
+ {
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
+ auto result = goo1(); // may throw.
+ if (scope.exception())
+ return;
+
+ result = goo2(); // may throw.
+ ...
+ return result;
+ }
+
+ But sometimes, for optimization reasons, we may choose to test the result of
+ the callee function instead doing a load of the VM exception value. See (7)
+ below.
+
+ 7. Checking exceptions by checking callee results
+
+ This approach should only be applied when it makes a difference to performance.
+ If we need to do this, we should add an ASSERT() that invokes the scope's
+ exception() method to verify the result. Since exception scope verification
+ is only done on DEBUG builds, this ASSERT will satisfy the verification
+ requirements without impacting performance. For example,
+
+ void foo(...)
+ {
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
+ bool failed = goo1(); // may throw.
+ ASSERT(!!scope.exception() == failed)
+ if (failed)
+ return;
+
+ result = goo2(); // may throw.
+ ...
+ return result;
+ }
+
+ 8. Debugging verification errors
+
+ a. When verification fails, you will see a message followed by an assertion
+ failure. For example:
+
+ ERROR: Unchecked JS exception:
+ This scope can throw a JS exception: setUpCall @ /Volumes/Data/ws6/OpenSource/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp:1245
+ (ExceptionScope::m_recursionDepth was ...)
+ But the exception was unchecked as of this scope: varargsSetup @ /Volumes/Data/ws6/OpenSource/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp:1398
+ (ExceptionScope::m_recursionDepth was ...)
+ [ backtrace here ]
+
+ The message tells you that failure was detected at in varargsSetup() at
+ LLIntSlowPaths.cpp line 1398, and that the missing exception check should
+ have happened somewhere between the call to setUpCall() at LLIntSlowPaths.cpp
+ line 1245 and it.
+
+ If that is insufficient information, you can ...
+
+ b. Dump simulated throws
+
+ Re-run the test case with JSC_dumpSimulatedThrows=true. You will also see
+ back traces at each simulated throw.
+
+ c. Narrowing down the source of a simulated throw
+
+ Another technique for narrowing down the source of simulated throws is by
+ further dividing a function to smaller regions by separating each region
+ with additional local throw scopes. For example,
+
+ ... // Region 1
+ { auto scope = DECLARE_THROW_SCOPE(vm); }
+ ... // Region 2
+ { auto scope = DECLARE_THROW_SCOPE(vm); }
+ ... // Region 3
+
+ * API/APIUtils.h:
+ (handleExceptionIfNeeded):
+ * CMakeLists.txt:
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+ * bindings/ScriptFunctionCall.cpp:
+ (Deprecated::ScriptFunctionCall::call):
+ * bindings/ScriptValue.cpp:
+ (Deprecated::ScriptValue::toString):
+ * debugger/Debugger.cpp:
+ (JSC::Debugger::pauseIfNeeded):
+ * debugger/DebuggerCallFrame.cpp:
+ (JSC::DebuggerCallFrame::evaluateWithScopeExtension):
+ * dfg/DFGOSRExitCompiler.cpp:
+ * dfg/DFGOperations.cpp:
+ (JSC::DFG::operationPutByValInternal):
+ * inspector/InjectedScriptManager.cpp:
+ (Inspector::InjectedScriptManager::createInjectedScript):
+ * inspector/JSGlobalObjectInspectorController.cpp:
+ (Inspector::JSGlobalObjectInspectorController::reportAPIException):
+ * inspector/JSInjectedScriptHost.cpp:
+ (Inspector::JSInjectedScriptHost::evaluateWithScopeExtension):
+ (Inspector::JSInjectedScriptHost::getInternalProperties):
+ (Inspector::JSInjectedScriptHost::weakMapEntries):
+ (Inspector::JSInjectedScriptHost::weakSetEntries):
+ (Inspector::JSInjectedScriptHost::iteratorEntries):
+ * inspector/JSJavaScriptCallFrame.cpp:
+ (Inspector::JSJavaScriptCallFrame::evaluateWithScopeExtension):
+ * inspector/ScriptCallStackFactory.cpp:
+ (Inspector::extractSourceInformationFromException):
+ * interpreter/CachedCall.h:
+ (JSC::CachedCall::CachedCall):
+ * interpreter/CallFrame.h:
+ (JSC::ExecState::clearException): Deleted.
+ (JSC::ExecState::exception): Deleted.
+ (JSC::ExecState::hadException): Deleted.
+ (JSC::ExecState::lastException): Deleted.
+ (JSC::ExecState::clearLastException): Deleted.
+ * interpreter/Interpreter.cpp:
+ (JSC::eval):
+ (JSC::sizeOfVarargs):
+ (JSC::notifyDebuggerOfUnwinding):
+ (JSC::Interpreter::unwind):
+ (JSC::Interpreter::execute):
+ (JSC::Interpreter::executeCall):
+ (JSC::Interpreter::executeConstruct):
+ (JSC::Interpreter::prepareForRepeatCall):
+ (JSC::Interpreter::debug):
+ * interpreter/Interpreter.h:
+ (JSC::SuspendExceptionScope::SuspendExceptionScope):
+ * interpreter/ShadowChicken.cpp:
+ (JSC::ShadowChicken::functionsOnStack):
+ * jit/JITCode.cpp:
+ (JSC::JITCode::execute):
+ * jit/JITExceptions.cpp:
+ (JSC::genericUnwind):
+ * jit/JITOperations.cpp:
+ (JSC::getByVal):
+ * jsc.cpp:
+ (WTF::ImpureGetter::getOwnPropertySlot):
+ (GlobalObject::moduleLoaderResolve):
+ (GlobalObject::moduleLoaderFetch):
+ (functionCreateElement):
+ (functionRun):
+ (functionRunString):
+ (functionLoad):
+ (functionLoadString):
+ (functionReadFile):
+ (functionCheckSyntax):
+ (functionSetRandomSeed):
+ (functionLoadModule):
+ (functionCreateBuiltin):
+ (functionCheckModuleSyntax):
+ (functionGenerateHeapSnapshot):
+ (functionSamplingProfilerStackTraces):
+ (dumpException):
+ (checkUncaughtException):
+ (runWithScripts):
+ (runInteractive):
+ * llint/LLIntExceptions.cpp:
+ (JSC::LLInt::returnToThrow):
+ (JSC::LLInt::callToThrow):
+ * llint/LLIntSlowPaths.cpp:
+ (JSC::LLInt::LLINT_SLOW_PATH_DECL):
+ * profiler/ProfilerBytecodeSequence.cpp:
+ (JSC::Profiler::BytecodeSequence::addSequenceProperties):
+ * profiler/ProfilerCompilation.cpp:
+ (JSC::Profiler::Compilation::toJS):
+ * profiler/ProfilerDatabase.cpp:
+ (JSC::Profiler::Database::toJS):
+ * profiler/ProfilerOSRExitSite.cpp:
+ (JSC::Profiler::OSRExitSite::toJS):
+ * profiler/ProfilerOriginStack.cpp:
+ (JSC::Profiler::OriginStack::toJS):
+ * runtime/ArrayPrototype.cpp:
+ (JSC::speciesConstructArray):
+ (JSC::shift):
+ (JSC::unshift):
+ (JSC::arrayProtoFuncToString):
+ (JSC::arrayProtoFuncToLocaleString):
+ (JSC::slowJoin):
+ (JSC::fastJoin):
+ (JSC::arrayProtoFuncJoin):
+ (JSC::arrayProtoFuncPop):
+ (JSC::arrayProtoFuncPush):
+ (JSC::arrayProtoFuncReverse):
+ (JSC::arrayProtoFuncShift):
+ (JSC::arrayProtoFuncSlice):
+ (JSC::arrayProtoFuncSplice):
+ (JSC::arrayProtoFuncUnShift):
+ (JSC::arrayProtoFuncIndexOf):
+ (JSC::arrayProtoFuncLastIndexOf):
+ (JSC::moveElements):
+ (JSC::concatAppendOne):
+ (JSC::arrayProtoPrivateFuncConcatMemcpy):
+ * runtime/BooleanConstructor.cpp:
+ (JSC::constructWithBooleanConstructor):
+ * runtime/CallData.cpp:
+ (JSC::call):
+ * runtime/CatchScope.cpp: Added.
+ (JSC::CatchScope::CatchScope):
+ (JSC::CatchScope::~CatchScope):
+ * runtime/CatchScope.h: Added.
+ (JSC::CatchScope::clearException):
+ (JSC::CatchScope::CatchScope):
+ * runtime/CommonSlowPaths.cpp:
+ (JSC::SLOW_PATH_DECL):
+ * runtime/CommonSlowPaths.h:
+ (JSC::CommonSlowPaths::opIn):
+ * runtime/CommonSlowPathsExceptions.cpp:
+ (JSC::CommonSlowPaths::interpreterThrowInCaller):
+ * runtime/Completion.cpp:
+ (JSC::evaluate):
+ (JSC::rejectPromise):
+ (JSC::loadAndEvaluateModule):
+ (JSC::loadModule):
+ * runtime/ConsoleObject.cpp:
+ (JSC::consoleProtoFuncAssert):
+ (JSC::consoleProtoFuncProfile):
+ (JSC::consoleProtoFuncProfileEnd):
+ (JSC::consoleProtoFuncTakeHeapSnapshot):
+ (JSC::consoleProtoFuncTime):
+ (JSC::consoleProtoFuncTimeEnd):
+ * runtime/DateConstructor.cpp:
+ (JSC::constructDate):
+ (JSC::dateParse):
+ * runtime/DatePrototype.cpp:
+ (JSC::dateProtoFuncToPrimitiveSymbol):
+ (JSC::dateProtoFuncToJSON):
+ * runtime/ErrorConstructor.cpp:
+ (JSC::Interpreter::constructWithErrorConstructor):
+ * runtime/ErrorInstance.cpp:
+ (JSC::ErrorInstance::sanitizedToString):
+ * runtime/ErrorPrototype.cpp:
+ (JSC::errorProtoFuncToString):
+ * runtime/ExceptionEventLocation.cpp: Added.
+ (WTF::printInternal):
+ * runtime/ExceptionEventLocation.h: Copied from Source/JavaScriptCore/runtime/ThrowScopeLocation.h.
+ (JSC::ExceptionEventLocation::ExceptionEventLocation):
+ (JSC::ThrowScopeLocation::ThrowScopeLocation): Deleted.
+ * runtime/ExceptionHelpers.h:
+ * runtime/ExceptionScope.cpp: Added.
+ (JSC::ExceptionScope::ExceptionScope):
+ (JSC::ExceptionScope::~ExceptionScope):
+ * runtime/ExceptionScope.h: Added.
+ (JSC::ExceptionScope::vm):
+ (JSC::ExceptionScope::recursionDepth):
+ (JSC::ExceptionScope::exception):
+ (JSC::ExceptionScope::ExceptionScope):
+ * runtime/FunctionConstructor.cpp:
+ (JSC::constructFunctionSkippingEvalEnabledCheck):
+ * runtime/FunctionPrototype.cpp:
+ (JSC::functionProtoFuncBind):
+ * runtime/GenericArgumentsInlines.h:
+ (JSC::GenericArguments<Type>::copyToArguments):
+ * runtime/GetterSetter.cpp:
+ (JSC::callGetter):
+ * runtime/InspectorInstrumentationObject.cpp:
+ (JSC::inspectorInstrumentationObjectLog):
+ * runtime/InternalFunction.cpp:
+ (JSC::InternalFunction::createSubclassStructure):
+ * runtime/IntlCollator.cpp:
+ (JSC::IntlCollator::initializeCollator):
+ (JSC::IntlCollator::createCollator):
+ (JSC::IntlCollator::resolvedOptions):
+ * runtime/IntlCollatorConstructor.cpp:
+ (JSC::constructIntlCollator):
+ (JSC::IntlCollatorConstructorFuncSupportedLocalesOf):
+ * runtime/IntlCollatorPrototype.cpp:
+ (JSC::IntlCollatorFuncCompare):
+ (JSC::IntlCollatorPrototypeGetterCompare):
+ * runtime/IntlDateTimeFormat.cpp:
+ (JSC::toDateTimeOptionsAnyDate):
+ (JSC::IntlDateTimeFormat::initializeDateTimeFormat):
+ (JSC::IntlDateTimeFormat::resolvedOptions):
+ (JSC::IntlDateTimeFormat::format):
+ * runtime/IntlDateTimeFormatConstructor.cpp:
+ (JSC::constructIntlDateTimeFormat):
+ (JSC::IntlDateTimeFormatConstructorFuncSupportedLocalesOf):
+ * runtime/IntlDateTimeFormatPrototype.cpp:
+ (JSC::IntlDateTimeFormatFuncFormatDateTime):
+ (JSC::IntlDateTimeFormatPrototypeGetterFormat):
+ * runtime/IntlNumberFormat.cpp:
+ (JSC::IntlNumberFormat::initializeNumberFormat):
+ (JSC::IntlNumberFormat::createNumberFormat):
+ (JSC::IntlNumberFormat::resolvedOptions):
+ * runtime/IntlNumberFormatConstructor.cpp:
+ (JSC::constructIntlNumberFormat):
+ (JSC::IntlNumberFormatConstructorFuncSupportedLocalesOf):
+ * runtime/IntlNumberFormatPrototype.cpp:
+ (JSC::IntlNumberFormatFuncFormatNumber):
+ (JSC::IntlNumberFormatPrototypeGetterFormat):
+ * runtime/IntlObject.cpp:
+ (JSC::intlBooleanOption):
+ (JSC::intlStringOption):
+ (JSC::intlNumberOption):
+ (JSC::canonicalizeLocaleList):
+ (JSC::supportedLocales):
+ * runtime/IntlObjectInlines.h:
+ (JSC::constructIntlInstanceWithWorkaroundForLegacyIntlConstructor):
+ * runtime/IteratorOperations.cpp:
+ (JSC::iteratorNext):
+ (JSC::iteratorStep):
+ (JSC::iteratorClose):
+ (JSC::iteratorForIterable):
+ * runtime/IteratorOperations.h:
+ (JSC::forEachInIterable):
+ * runtime/JSArray.cpp:
+ (JSC::JSArray::pop):
+ (JSC::JSArray::push):
+ (JSC::JSArray::copyToArguments):
+ * runtime/JSArrayBufferConstructor.cpp:
+ (JSC::constructArrayBuffer):
+ * runtime/JSArrayBufferPrototype.cpp:
+ (JSC::arrayBufferProtoFuncSlice):
+ * runtime/JSArrayInlines.h:
+ (JSC::getLength):
+ (JSC::toLength):
+ * runtime/JSBoundFunction.cpp:
+ (JSC::getBoundFunctionStructure):
+ (JSC::JSBoundFunction::create):
+ * runtime/JSCJSValue.cpp:
+ (JSC::JSValue::putToPrimitive):
+ (JSC::JSValue::putToPrimitiveByIndex):
+ (JSC::JSValue::toStringSlowCase):
+ * runtime/JSCJSValueInlines.h:
+ (JSC::toPreferredPrimitiveType):
+ (JSC::JSValue::getPropertySlot):
+ (JSC::JSValue::equalSlowCaseInline):
+ * runtime/JSDataViewPrototype.cpp:
+ (JSC::getData):
+ (JSC::setData):
+ * runtime/JSFunction.cpp:
+ (JSC::JSFunction::setFunctionName):
+ * runtime/JSGenericTypedArrayView.h:
+ (JSC::JSGenericTypedArrayView::setIndex):
+ * runtime/JSGenericTypedArrayViewConstructorInlines.h:
+ (JSC::constructGenericTypedArrayViewFromIterator):
+ (JSC::constructGenericTypedArrayViewWithArguments):
+ (JSC::constructGenericTypedArrayView):
+ * runtime/JSGenericTypedArrayViewPrototypeFunctions.h:
+ (JSC::speciesConstruct):
+ (JSC::genericTypedArrayViewProtoFuncCopyWithin):
+ (JSC::genericTypedArrayViewProtoFuncIncludes):
+ (JSC::genericTypedArrayViewProtoFuncIndexOf):
+ (JSC::genericTypedArrayViewProtoFuncJoin):
+ (JSC::genericTypedArrayViewProtoFuncLastIndexOf):
+ (JSC::genericTypedArrayViewProtoFuncSlice):
+ (JSC::genericTypedArrayViewPrivateFuncSubarrayCreate):
+ * runtime/JSGlobalObject.h:
+ (JSC::constructEmptyArray):
+ (JSC::constructArray):
+ (JSC::constructArrayNegativeIndexed):
+ * runtime/JSGlobalObjectFunctions.cpp:
+ (JSC::globalFuncEval):
+ * runtime/JSJob.cpp:
+ (JSC::JSJobMicrotask::run):
+ * runtime/JSModuleEnvironment.cpp:
+ (JSC::JSModuleEnvironment::getOwnPropertySlot):
+ * runtime/JSModuleLoader.cpp:
+ (JSC::JSModuleLoader::fetch):
+ * runtime/JSModuleNamespaceObject.cpp:
+ (JSC::JSModuleNamespaceObject::finishCreation):
+ (JSC::JSModuleNamespaceObject::getOwnPropertySlot):
+ * runtime/JSModuleRecord.cpp:
+ (JSC::JSModuleRecord::instantiateDeclarations):
+ * runtime/JSONObject.cpp:
+ (JSC::Stringifier::Stringifier):
+ (JSC::Stringifier::stringify):
+ (JSC::Stringifier::toJSON):
+ (JSC::Stringifier::appendStringifiedValue):
+ (JSC::Stringifier::Holder::appendNextProperty):
+ (JSC::Walker::walk):
+ (JSC::JSONProtoFuncParse):
+ * runtime/JSObject.cpp:
+ (JSC::ordinarySetSlow):
+ (JSC::JSObject::setPrototypeWithCycleCheck):
+ (JSC::callToPrimitiveFunction):
+ (JSC::JSObject::ordinaryToPrimitive):
+ (JSC::JSObject::defaultHasInstance):
+ (JSC::JSObject::getPropertyNames):
+ (JSC::JSObject::toNumber):
+ (JSC::JSObject::toString):
+ (JSC::JSObject::defineOwnNonIndexProperty):
+ (JSC::JSObject::getGenericPropertyNames):
+ (JSC::JSObject::getMethod):
+ * runtime/JSObjectInlines.h:
+ (JSC::createListFromArrayLike):
+ (JSC::JSObject::getPropertySlot):
+ (JSC::JSObject::getNonIndexPropertySlot):
+ * runtime/JSPromiseConstructor.cpp:
+ (JSC::constructPromise):
+ * runtime/JSPropertyNameEnumerator.h:
+ (JSC::propertyNameEnumerator):
+ * runtime/JSPropertyNameIterator.cpp:
+ (JSC::JSPropertyNameIterator::create):
+ * runtime/JSScope.cpp:
+ (JSC::isUnscopable):
+ (JSC::JSScope::resolve):
+ * runtime/JSString.cpp:
+ (JSC::JSString::equalSlowCase):
+ * runtime/JSStringJoiner.cpp:
+ (JSC::JSStringJoiner::join):
+ * runtime/LiteralParser.cpp:
+ (JSC::LiteralParser<CharType>::parse):
+ * runtime/MapConstructor.cpp:
+ (JSC::constructMap):
+ * runtime/MathObject.cpp:
+ (JSC::mathProtoFuncClz32):
+ (JSC::mathProtoFuncHypot):
+ (JSC::mathProtoFuncIMul):
+ * runtime/ModuleLoaderPrototype.cpp:
+ (JSC::moduleLoaderPrototypeParseModule):
+ (JSC::moduleLoaderPrototypeRequestedModules):
+ (JSC::moduleLoaderPrototypeModuleDeclarationInstantiation):
+ * runtime/NativeErrorConstructor.cpp:
+ (JSC::Interpreter::constructWithNativeErrorConstructor):
+ * runtime/NumberConstructor.cpp:
+ (JSC::constructWithNumberConstructor):
+ * runtime/ObjectConstructor.cpp:
+ (JSC::constructObject):
+ (JSC::objectConstructorGetPrototypeOf):
+ (JSC::objectConstructorSetPrototypeOf):
+ (JSC::objectConstructorGetOwnPropertyDescriptor):
+ (JSC::objectConstructorGetOwnPropertyDescriptors):
+ (JSC::objectConstructorGetOwnPropertyNames):
+ (JSC::objectConstructorGetOwnPropertySymbols):
+ (JSC::objectConstructorKeys):
+ (JSC::ownEnumerablePropertyKeys):
+ (JSC::toPropertyDescriptor):
+ (JSC::objectConstructorDefineProperty):
+ (JSC::defineProperties):
+ (JSC::objectConstructorSeal):
+ (JSC::objectConstructorFreeze):
+ (JSC::objectConstructorIsSealed):
+ (JSC::objectConstructorIsFrozen):
+ (JSC::objectConstructorIsExtensible):
+ (JSC::ownPropertyKeys):
+ * runtime/ObjectConstructor.h:
+ (JSC::constructObjectFromPropertyDescriptor):
+ * runtime/ObjectPrototype.cpp:
+ (JSC::objectProtoFuncHasOwnProperty):
+ (JSC::objectProtoFuncIsPrototypeOf):
+ (JSC::objectProtoFuncDefineGetter):
+ (JSC::objectProtoFuncDefineSetter):
+ (JSC::objectProtoFuncLookupGetter):
+ (JSC::objectProtoFuncLookupSetter):
+ (JSC::objectProtoFuncPropertyIsEnumerable):
+ (JSC::objectProtoFuncToLocaleString):
+ (JSC::objectProtoFuncToString):
+ * runtime/Operations.cpp:
+ (JSC::jsAddSlowCase):
+ * runtime/Options.h:
+ * runtime/PropertyDescriptor.cpp:
+ (JSC::PropertyDescriptor::slowGetterSetter):
+ * runtime/ProxyConstructor.cpp:
+ (JSC::makeRevocableProxy):
+ * runtime/ProxyObject.cpp:
+ (JSC::ProxyObject::toStringName):
+ (JSC::performProxyGet):
+ (JSC::ProxyObject::performGet):
+ (JSC::ProxyObject::performInternalMethodGetOwnProperty):
+ (JSC::ProxyObject::performHasProperty):
+ (JSC::ProxyObject::performPut):
+ (JSC::ProxyObject::putByIndexCommon):
+ (JSC::performProxyCall):
+ (JSC::performProxyConstruct):
+ (JSC::ProxyObject::performDelete):
+ (JSC::ProxyObject::performPreventExtensions):
+ (JSC::ProxyObject::performIsExtensible):
+ (JSC::ProxyObject::performDefineOwnProperty):
+ (JSC::ProxyObject::performGetOwnPropertyNames):
+ (JSC::ProxyObject::performSetPrototype):
+ (JSC::ProxyObject::performGetPrototype):
+ * runtime/ReflectObject.cpp:
+ (JSC::reflectObjectConstruct):
+ (JSC::reflectObjectDefineProperty):
+ (JSC::reflectObjectGet):
+ (JSC::reflectObjectGetOwnPropertyDescriptor):
+ (JSC::reflectObjectIsExtensible):
+ (JSC::reflectObjectPreventExtensions):
+ (JSC::reflectObjectSet):
+ (JSC::reflectObjectSetPrototypeOf):
+ * runtime/RegExpConstructor.cpp:
+ (JSC::toFlags):
+ (JSC::regExpCreate):
+ (JSC::constructRegExp):
+ * runtime/RegExpConstructor.h:
+ (JSC::isRegExp):
+ * runtime/RegExpObject.cpp:
+ (JSC::collectMatches):
+ (JSC::RegExpObject::matchGlobal):
+ * runtime/RegExpPrototype.cpp:
+ (JSC::regExpProtoFuncCompile):
+ (JSC::flagsString):
+ (JSC::regExpProtoFuncToString):
+ (JSC::regExpProtoGetterFlags):
+ (JSC::regExpProtoFuncSearchFast):
+ (JSC::regExpProtoFuncSplitFast):
+ * runtime/SetConstructor.cpp:
+ (JSC::constructSet):
+ * runtime/StringConstructor.cpp:
+ (JSC::stringFromCodePoint):
+ (JSC::constructWithStringConstructor):
+ * runtime/StringObject.cpp:
+ (JSC::StringObject::defineOwnProperty):
+ * runtime/StringPrototype.cpp:
+ (JSC::replaceUsingRegExpSearch):
+ (JSC::operationStringProtoFuncReplaceRegExpEmptyStr):
+ (JSC::replaceUsingStringSearch):
+ (JSC::replace):
+ (JSC::stringProtoFuncReplaceUsingRegExp):
+ (JSC::stringProtoFuncReplaceUsingStringSearch):
+ (JSC::stringProtoFuncCodePointAt):
+ (JSC::stringProtoFuncSlice):
+ (JSC::stringProtoFuncSplitFast):
+ (JSC::stringProtoFuncSubstr):
+ (JSC::stringProtoFuncSubstring):
+ (JSC::stringProtoFuncLocaleCompare):
+ (JSC::toLocaleCase):
+ (JSC::stringProtoFuncBig):
+ (JSC::stringProtoFuncSmall):
+ (JSC::stringProtoFuncBlink):
+ (JSC::stringProtoFuncBold):
+ (JSC::stringProtoFuncFixed):
+ (JSC::stringProtoFuncItalics):
+ (JSC::stringProtoFuncStrike):
+ (JSC::stringProtoFuncSub):
+ (JSC::stringProtoFuncSup):
+ (JSC::stringProtoFuncFontcolor):
+ (JSC::stringProtoFuncFontsize):
+ (JSC::stringProtoFuncAnchor):
+ (JSC::stringProtoFuncLink):
+ (JSC::trimString):
+ (JSC::stringProtoFuncStartsWith):
+ (JSC::stringProtoFuncEndsWith):
+ (JSC::stringIncludesImpl):
+ (JSC::stringProtoFuncIncludes):
+ (JSC::builtinStringIncludesInternal):
+ (JSC::stringProtoFuncNormalize):
+ * runtime/SymbolConstructor.cpp:
+ (JSC::symbolConstructorFor):
+ * runtime/TemplateRegistry.cpp:
+ (JSC::TemplateRegistry::getTemplateObject):
+ * runtime/ThrowScope.cpp:
+ (JSC::ThrowScope::ThrowScope):
+ (JSC::ThrowScope::~ThrowScope):
+ (JSC::ThrowScope::throwException):
+ (JSC::ThrowScope::simulateThrow):
+ (JSC::ThrowScope::printIfNeedCheck): Deleted.
+ (JSC::ThrowScope::verifyExceptionCheckNeedIsSatisfied): Deleted.
+ * runtime/ThrowScope.h:
+ (JSC::ThrowScope::release):
+ (JSC::ThrowScope::ThrowScope):
+ (JSC::ThrowScope::throwException):
+ (JSC::ThrowScope::vm): Deleted.
+ (JSC::ThrowScope::exception): Deleted.
+ * runtime/ThrowScopeLocation.h: Removed.
+ * runtime/VM.cpp:
+ (JSC::VM::verifyExceptionCheckNeedIsSatisfied):
+ * runtime/VM.h:
+ (JSC::VM::exception):
+ (JSC::VM::clearException):
+ (JSC::VM::setException): Deleted.
+ * runtime/WeakMapConstructor.cpp:
+ (JSC::constructWeakMap):
+ * runtime/WeakSetConstructor.cpp:
+ (JSC::constructWeakSet):
+ * tools/JSDollarVMPrototype.cpp:
+ (JSC::functionPrint):
+
</ins><span class="cx"> 2016-09-07 Andy VanWagoner <thetalecrafter@gmail.com>
</span><span class="cx">
</span><span class="cx"> [INTL] some valid language tags cause errors in Intl constructors
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -2148,12 +2148,17 @@
</span><span class="cx"> FE5068671AE25E280009DAB7 /* DeferredSourceDump.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE5068661AE25E280009DAB7 /* DeferredSourceDump.cpp */; };
</span><span class="cx"> FE5932A7183C5A2600A1ECCC /* VMEntryScope.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE5932A5183C5A2600A1ECCC /* VMEntryScope.cpp */; };
</span><span class="cx"> FE5932A8183C5A2600A1ECCC /* VMEntryScope.h in Headers */ = {isa = PBXBuildFile; fileRef = FE5932A6183C5A2600A1ECCC /* VMEntryScope.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- FE6029D91D6E1E4F0030204D /* ThrowScopeLocation.h in Headers */ = {isa = PBXBuildFile; fileRef = FE6029D81D6E1E330030204D /* ThrowScopeLocation.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><ins>+ FE6029D91D6E1E4F0030204D /* ExceptionEventLocation.h in Headers */ = {isa = PBXBuildFile; fileRef = FE6029D81D6E1E330030204D /* ExceptionEventLocation.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ FE6491371D78F01D00A694D4 /* ExceptionScope.h in Headers */ = {isa = PBXBuildFile; fileRef = FE6491361D78F01300A694D4 /* ExceptionScope.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ FE6491391D78F3AF00A694D4 /* ExceptionScope.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE6491381D78F3A300A694D4 /* ExceptionScope.cpp */; };
</ins><span class="cx"> FE68C6371B90DE040042BCB3 /* MacroAssemblerPrinter.h in Headers */ = {isa = PBXBuildFile; fileRef = FE68C6361B90DDD90042BCB3 /* MacroAssemblerPrinter.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> FE68C6381B90DE0B0042BCB3 /* MacroAssemblerPrinter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE68C6351B90DDD90042BCB3 /* MacroAssemblerPrinter.cpp */; };
</span><span class="cx"> FE7BA60F1A1A7CEC00F1F7B4 /* HeapVerifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE7BA60D1A1A7CEC00F1F7B4 /* HeapVerifier.cpp */; };
</span><span class="cx"> FE7BA6101A1A7CEC00F1F7B4 /* HeapVerifier.h in Headers */ = {isa = PBXBuildFile; fileRef = FE7BA60E1A1A7CEC00F1F7B4 /* HeapVerifier.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> FE7C41961B97FC4B00F4D598 /* PingPongStackOverflowTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEDA50D41B97F442009A3B4F /* PingPongStackOverflowTest.cpp */; };
</span><ins>+ FE80C1971D775CDD008510C0 /* CatchScope.h in Headers */ = {isa = PBXBuildFile; fileRef = FE80C1961D775B27008510C0 /* CatchScope.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ FE80C1991D775FBE008510C0 /* CatchScope.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE80C1981D775FB4008510C0 /* CatchScope.cpp */; };
+ FE80C19B1D776A98008510C0 /* ExceptionEventLocation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE80C19A1D7768FD008510C0 /* ExceptionEventLocation.cpp */; };
</ins><span class="cx"> FE99B2491C24C3D300C82159 /* JITNegGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = FE99B2481C24B6D300C82159 /* JITNegGenerator.h */; };
</span><span class="cx"> FE99B24A1C24C3D700C82159 /* JITNegGenerator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE99B2471C24B6D300C82159 /* JITNegGenerator.cpp */; };
</span><span class="cx"> FEA08620182B7A0400F6D851 /* Breakpoint.h in Headers */ = {isa = PBXBuildFile; fileRef = FEA0861E182B7A0400F6D851 /* Breakpoint.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -4475,11 +4480,16 @@
</span><span class="cx"> FE5068661AE25E280009DAB7 /* DeferredSourceDump.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeferredSourceDump.cpp; sourceTree = "<group>"; };
</span><span class="cx"> FE5932A5183C5A2600A1ECCC /* VMEntryScope.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VMEntryScope.cpp; sourceTree = "<group>"; };
</span><span class="cx"> FE5932A6183C5A2600A1ECCC /* VMEntryScope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VMEntryScope.h; sourceTree = "<group>"; };
</span><del>- FE6029D81D6E1E330030204D /* ThrowScopeLocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThrowScopeLocation.h; sourceTree = "<group>"; };
</del><ins>+ FE6029D81D6E1E330030204D /* ExceptionEventLocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExceptionEventLocation.h; sourceTree = "<group>"; };
+ FE6491361D78F01300A694D4 /* ExceptionScope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExceptionScope.h; sourceTree = "<group>"; };
+ FE6491381D78F3A300A694D4 /* ExceptionScope.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ExceptionScope.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> FE68C6351B90DDD90042BCB3 /* MacroAssemblerPrinter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MacroAssemblerPrinter.cpp; sourceTree = "<group>"; };
</span><span class="cx"> FE68C6361B90DDD90042BCB3 /* MacroAssemblerPrinter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MacroAssemblerPrinter.h; sourceTree = "<group>"; };
</span><span class="cx"> FE7BA60D1A1A7CEC00F1F7B4 /* HeapVerifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HeapVerifier.cpp; sourceTree = "<group>"; };
</span><span class="cx"> FE7BA60E1A1A7CEC00F1F7B4 /* HeapVerifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HeapVerifier.h; sourceTree = "<group>"; };
</span><ins>+ FE80C1961D775B27008510C0 /* CatchScope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CatchScope.h; sourceTree = "<group>"; };
+ FE80C1981D775FB4008510C0 /* CatchScope.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CatchScope.cpp; sourceTree = "<group>"; };
+ FE80C19A1D7768FD008510C0 /* ExceptionEventLocation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ExceptionEventLocation.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> FE90BB3A1B7CF64E006B3F03 /* VMInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VMInlines.h; sourceTree = "<group>"; };
</span><span class="cx"> FE98B5B61BB9AE110073E7A6 /* JITSubGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JITSubGenerator.h; sourceTree = "<group>"; };
</span><span class="cx"> FE99B2471C24B6D300C82159 /* JITNegGenerator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JITNegGenerator.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -5737,6 +5747,8 @@
</span><span class="cx"> 0FB7F38C15ED8E3800F167B2 /* ButterflyInlines.h */,
</span><span class="cx"> BCA62DFE0E2826230004F30D /* CallData.cpp */,
</span><span class="cx"> 145C507F0D9DF63B0088F6B9 /* CallData.h */,
</span><ins>+ FE80C1981D775FB4008510C0 /* CatchScope.cpp */,
+ FE80C1961D775B27008510C0 /* CatchScope.h */,
</ins><span class="cx"> BC6AAAE40E1F426500AD87D8 /* ClassInfo.h */,
</span><span class="cx"> 0FE0501C1AA9095600D33B33 /* ClonedArguments.cpp */,
</span><span class="cx"> 0FE0501D1AA9095600D33B33 /* ClonedArguments.h */,
</span><span class="lines">@@ -5801,10 +5813,14 @@
</span><span class="cx"> BC02E9070E1839DB000F9297 /* ErrorPrototype.h */,
</span><span class="cx"> FE1C0FFE1B194FD100B53FCA /* Exception.cpp */,
</span><span class="cx"> FE1C0FFC1B193E9800B53FCA /* Exception.h */,
</span><ins>+ FE80C19A1D7768FD008510C0 /* ExceptionEventLocation.cpp */,
+ FE6029D81D6E1E330030204D /* ExceptionEventLocation.h */,
</ins><span class="cx"> 0F12DE0D1979D5FD0006FF4E /* ExceptionFuzz.cpp */,
</span><span class="cx"> 0F12DE0E1979D5FD0006FF4E /* ExceptionFuzz.h */,
</span><span class="cx"> 1429D8770ED21ACD00B89619 /* ExceptionHelpers.cpp */,
</span><span class="cx"> A72701B30DADE94900E548D7 /* ExceptionHelpers.h */,
</span><ins>+ FE6491381D78F3A300A694D4 /* ExceptionScope.cpp */,
+ FE6491361D78F01300A694D4 /* ExceptionScope.h */,
</ins><span class="cx"> 86CA032D1038E8440028A609 /* Executable.cpp */,
</span><span class="cx"> 86CAFEE21035DDE60028A609 /* Executable.h */,
</span><span class="cx"> A7A8AF2917ADB5F3005AB174 /* Float32Array.h */,
</span><span class="lines">@@ -6204,7 +6220,6 @@
</span><span class="cx"> 0FA2C17A17D7CF84009D015F /* TestRunnerUtils.h */,
</span><span class="cx"> FE2E6A7A1D6EA5FE0060F896 /* ThrowScope.cpp */,
</span><span class="cx"> FE3422111D6B818C0032BE88 /* ThrowScope.h */,
</span><del>- FE6029D81D6E1E330030204D /* ThrowScopeLocation.h */,
</del><span class="cx"> 0F55989717C86C5600A1E543 /* ToNativeFromValue.h */,
</span><span class="cx"> 0F2B66D817B6B5AB00A7AE3F /* TypedArrayAdaptors.h */,
</span><span class="cx"> 0F2B66D917B6B5AB00A7AE3F /* TypedArrayController.cpp */,
</span><span class="lines">@@ -7759,7 +7774,7 @@
</span><span class="cx"> FE3A06C01C11041A00390FDD /* JITRightShiftGenerator.h in Headers */,
</span><span class="cx"> 708EBE241CE8F35800453146 /* IntlObjectInlines.h in Headers */,
</span><span class="cx"> 0F070A481D543A90006E7232 /* CellContainerInlines.h in Headers */,
</span><del>- FE6029D91D6E1E4F0030204D /* ThrowScopeLocation.h in Headers */,
</del><ins>+ FE6029D91D6E1E4F0030204D /* ExceptionEventLocation.h in Headers */,
</ins><span class="cx"> 0FE0501B1AA9091100D33B33 /* GenericOffset.h in Headers */,
</span><span class="cx"> 0F2B66E017B6B5AB00A7AE3F /* GenericTypedArrayView.h in Headers */,
</span><span class="cx"> 0F2B66E117B6B5AB00A7AE3F /* GenericTypedArrayViewInlines.h in Headers */,
</span><span class="lines">@@ -8280,6 +8295,7 @@
</span><span class="cx"> 145722861437E140005FDE26 /* StrongInlines.h in Headers */,
</span><span class="cx"> BCDE3AB80E6C82F5001453A7 /* Structure.h in Headers */,
</span><span class="cx"> 7E4EE7090EBB7963005934AA /* StructureChain.h in Headers */,
</span><ins>+ FE6491371D78F01D00A694D4 /* ExceptionScope.h in Headers */,
</ins><span class="cx"> 2AAAA31218BD49D100394CC8 /* StructureIDBlob.h in Headers */,
</span><span class="cx"> 436E54531C468E7400B5AF73 /* B3LegalizeMemoryOffsets.h in Headers */,
</span><span class="cx"> 2AF7382D18BBBF92008A5A37 /* StructureIDTable.h in Headers */,
</span><span class="lines">@@ -8373,6 +8389,7 @@
</span><span class="cx"> 709FB86C1AE335C60039D069 /* WeakSetPrototype.h in Headers */,
</span><span class="cx"> BC18C47A0E16F5CD00B34460 /* WebKitAvailability.h in Headers */,
</span><span class="cx"> A7DCB97312E5193F00911940 /* WriteBarrier.h in Headers */,
</span><ins>+ FE80C1971D775CDD008510C0 /* CatchScope.h in Headers */,
</ins><span class="cx"> 2A4EC90C1860D6C20094F782 /* WriteBarrierBuffer.h in Headers */,
</span><span class="cx"> C2B6D75318A33793004A9301 /* WriteBarrierInlines.h in Headers */,
</span><span class="cx"> 0FC8150A14043BF500CFA603 /* WriteBarrierSupport.h in Headers */,
</span><span class="lines">@@ -8905,6 +8922,7 @@
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> files = (
</span><span class="cx"> 0FFA549716B8835000B3A982 /* A64DOpcode.cpp in Sources */,
</span><ins>+ FE6491391D78F3AF00A694D4 /* ExceptionScope.cpp in Sources */,
</ins><span class="cx"> 0F55F0F414D1063900AC7649 /* AbstractPC.cpp in Sources */,
</span><span class="cx"> 0FEC856D1BDACDC70080FF74 /* AirAllocateStack.cpp in Sources */,
</span><span class="cx"> 43422A661C16267500E2EB98 /* B3ReduceDoubleToFloat.cpp in Sources */,
</span><span class="lines">@@ -9387,6 +9405,7 @@
</span><span class="cx"> 0F2B66E617B6B5AB00A7AE3F /* JSArrayBufferPrototype.cpp in Sources */,
</span><span class="cx"> 0F2B66E817B6B5AB00A7AE3F /* JSArrayBufferView.cpp in Sources */,
</span><span class="cx"> A5311C371C77CECA00E6B1B6 /* HeapSnapshotBuilder.cpp in Sources */,
</span><ins>+ FE80C1991D775FBE008510C0 /* CatchScope.cpp in Sources */,
</ins><span class="cx"> 1421359B0A677F4F00A8195E /* JSBase.cpp in Sources */,
</span><span class="cx"> 86FA9E91142BBB2E001773B7 /* JSBoundFunction.cpp in Sources */,
</span><span class="cx"> 1440F8AF0A508D200005F061 /* JSCallbackConstructor.cpp in Sources */,
</span><span class="lines">@@ -9499,6 +9518,7 @@
</span><span class="cx"> 0F4680A414BA7F8D00BFE272 /* LLIntSlowPaths.cpp in Sources */,
</span><span class="cx"> 0F0B839C14BCF46300885B4F /* LLIntThunks.cpp in Sources */,
</span><span class="cx"> 14469DDE107EC7E700650446 /* Lookup.cpp in Sources */,
</span><ins>+ FE80C19B1D776A98008510C0 /* ExceptionEventLocation.cpp in Sources */,
</ins><span class="cx"> 0F4680CC14BBB17A00BFE272 /* LowLevelInterpreter.cpp in Sources */,
</span><span class="cx"> A5AB49DC1BEC8082007020FB /* PerGlobalObjectWrapperWorld.cpp in Sources */,
</span><span class="cx"> 14B723B212D7DA46003BD5ED /* MachineStackMarker.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebindingsScriptFunctionCallcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bindings/ScriptFunctionCall.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bindings/ScriptFunctionCall.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/bindings/ScriptFunctionCall.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -105,10 +105,12 @@
</span><span class="cx"> {
</span><span class="cx"> JSObject* thisObject = m_thisObject.jsObject();
</span><span class="cx">
</span><del>- JSLockHolder lock(m_exec);
</del><ins>+ VM& vm = m_exec->vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx">
</span><span class="cx"> JSValue function = thisObject->get(m_exec, Identifier::fromString(m_exec, m_name));
</span><del>- if (m_exec->hadException()) {
</del><ins>+ if (UNLIKELY(scope.exception())) {
</ins><span class="cx"> hadException = true;
</span><span class="cx"> return { };
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebindingsScriptValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bindings/ScriptValue.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bindings/ScriptValue.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/bindings/ScriptValue.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -121,10 +121,13 @@
</span><span class="cx">
</span><span class="cx"> String ScriptValue::toString(ExecState* scriptState) const
</span><span class="cx"> {
</span><ins>+ VM& vm = scriptState->vm();
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
</ins><span class="cx"> String result = m_value.get().toString(scriptState)->value(scriptState);
</span><span class="cx"> // Handle the case where an exception is thrown as part of invoking toString on the object.
</span><del>- if (scriptState->hadException())
- scriptState->clearException();
</del><ins>+ if (UNLIKELY(scope.exception()))
+ scope.clearException();
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerDebuggercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/debugger/Debugger.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/Debugger.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/debugger/Debugger.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -623,6 +623,9 @@
</span><span class="cx">
</span><span class="cx"> void Debugger::pauseIfNeeded(CallFrame* callFrame)
</span><span class="cx"> {
</span><ins>+ VM& vm = callFrame->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> if (m_isPaused)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -662,7 +665,7 @@
</span><span class="cx"> {
</span><span class="cx"> PauseReasonDeclaration reason(*this, didHitBreakpoint ? PausedForBreakpoint : m_reasonForPause);
</span><span class="cx"> handlePause(vmEntryGlobalObject, m_reasonForPause);
</span><del>- RELEASE_ASSERT(!callFrame->hadException());
</del><ins>+ RELEASE_ASSERT(!scope.exception());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_pausingBreakpointID = noBreakpointID;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerDebuggerCallFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -217,7 +217,9 @@
</span><span class="cx"> if (!callFrame)
</span><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><del>- JSLockHolder lock(callFrame);
</del><ins>+ VM& vm = callFrame->vm();
+ JSLockHolder lock(vm);
+ auto catchScope = DECLARE_CATCH_SCOPE(vm);
</ins><span class="cx">
</span><span class="cx"> CodeBlock* codeBlock = nullptr;
</span><span class="cx"> if (isTailDeleted())
</span><span class="lines">@@ -228,7 +230,6 @@
</span><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> DebuggerEvalEnabler evalEnabler(callFrame);
</span><del>- VM& vm = callFrame->vm();
</del><span class="cx">
</span><span class="cx"> EvalContextType evalContextType;
</span><span class="cx">
</span><span class="lines">@@ -243,9 +244,9 @@
</span><span class="cx"> JSScope::collectVariablesUnderTDZ(scope()->jsScope(), variablesUnderTDZ);
</span><span class="cx">
</span><span class="cx"> EvalExecutable* eval = EvalExecutable::create(callFrame, makeSource(script), codeBlock->isStrictMode(), codeBlock->unlinkedCodeBlock()->derivedContextType(), codeBlock->unlinkedCodeBlock()->isArrowFunction(), evalContextType, &variablesUnderTDZ);
</span><del>- if (vm.exception()) {
- exception = vm.exception();
- vm.clearException();
</del><ins>+ if (UNLIKELY(catchScope.exception())) {
+ exception = catchScope.exception();
+ catchScope.clearException();
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -257,9 +258,9 @@
</span><span class="cx">
</span><span class="cx"> JSValue thisValue = this->thisValue();
</span><span class="cx"> JSValue result = vm.interpreter->execute(eval, callFrame, thisValue, scope()->jsScope());
</span><del>- if (vm.exception()) {
- exception = vm.exception();
- vm.clearException();
</del><ins>+ if (UNLIKELY(catchScope.exception())) {
+ exception = catchScope.exception();
+ catchScope.clearException();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (scopeExtensionObject)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGOSRExitCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGOSRExitCompiler.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGOSRExitCompiler.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/dfg/DFGOSRExitCompiler.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -112,14 +112,15 @@
</span><span class="cx">
</span><span class="cx"> void compileOSRExit(ExecState* exec)
</span><span class="cx"> {
</span><del>- if (exec->vm().callFrameForCatch)
- RELEASE_ASSERT(exec->vm().callFrameForCatch == exec);
</del><ins>+ VM* vm = &exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(*vm);
+
+ if (vm->callFrameForCatch)
+ RELEASE_ASSERT(vm->callFrameForCatch == exec);
</ins><span class="cx">
</span><span class="cx"> CodeBlock* codeBlock = exec->codeBlock();
</span><span class="cx"> ASSERT(codeBlock);
</span><span class="cx"> ASSERT(codeBlock->jitType() == JITCode::DFGJIT);
</span><del>-
- VM* vm = &exec->vm();
</del><span class="cx">
</span><span class="cx"> // It's sort of preferable that we don't GC while in here. Anyways, doing so wouldn't
</span><span class="cx"> // really be profitable.
</span><span class="lines">@@ -131,7 +132,7 @@
</span><span class="cx"> if (vm->callFrameForCatch)
</span><span class="cx"> ASSERT(exit.m_kind == GenericUnwind);
</span><span class="cx"> if (exit.isExceptionHandler())
</span><del>- ASSERT(!!vm->exception());
</del><ins>+ ASSERT_UNUSED(scope, !!scope.exception());
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> prepareCodeOriginForOSRExit(exec, exit.m_codeOrigin);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGOperationscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -97,6 +97,7 @@
</span><span class="cx"> ALWAYS_INLINE static void JIT_OPERATION operationPutByValInternal(ExecState* exec, EncodedJSValue encodedBase, EncodedJSValue encodedProperty, EncodedJSValue encodedValue)
</span><span class="cx"> {
</span><span class="cx"> VM* vm = &exec->vm();
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(*vm);
</ins><span class="cx"> NativeCallFrameTracer tracer(vm, exec);
</span><span class="cx">
</span><span class="cx"> JSValue baseValue = JSValue::decode(encodedBase);
</span><span class="lines">@@ -121,7 +122,7 @@
</span><span class="cx">
</span><span class="cx"> // Don't put to an object if toString throws an exception.
</span><span class="cx"> auto propertyName = property.toPropertyKey(exec);
</span><del>- if (vm->exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> PutPropertySlot slot(baseValue, strict);
</span><span class="lines">@@ -181,11 +182,12 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(&vm, exec);
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> if (constructor->type() == JSFunctionType)
</span><span class="cx"> return constructEmptyObject(exec, jsCast<JSFunction*>(constructor)->rareData(exec, inlineCapacity)->objectAllocationProfile()->structure());
</span><span class="cx">
</span><span class="cx"> JSValue proto = constructor->get(exec, exec->propertyNames().prototype);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> if (proto.isObject())
</span><span class="cx"> return constructEmptyObject(exec, asObject(proto));
</span><span class="lines">@@ -209,12 +211,13 @@
</span><span class="cx"> {
</span><span class="cx"> VM* vm = &exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(vm, exec);
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(*vm);
</ins><span class="cx">
</span><span class="cx"> JSValue op1 = JSValue::decode(encodedOp1);
</span><span class="cx"> JSValue op2 = JSValue::decode(encodedOp2);
</span><span class="cx">
</span><span class="cx"> int32_t a = op1.toInt32(exec);
</span><del>- if (UNLIKELY(vm->exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> int32_t b = op2.toInt32(exec);
</span><span class="cx"> return JSValue::encode(jsNumber(a & b));
</span><span class="lines">@@ -224,12 +227,13 @@
</span><span class="cx"> {
</span><span class="cx"> VM* vm = &exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(vm, exec);
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(*vm);
</ins><span class="cx">
</span><span class="cx"> JSValue op1 = JSValue::decode(encodedOp1);
</span><span class="cx"> JSValue op2 = JSValue::decode(encodedOp2);
</span><span class="cx">
</span><span class="cx"> int32_t a = op1.toInt32(exec);
</span><del>- if (UNLIKELY(vm->exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> int32_t b = op2.toInt32(exec);
</span><span class="cx"> return JSValue::encode(jsNumber(a | b));
</span><span class="lines">@@ -239,12 +243,13 @@
</span><span class="cx"> {
</span><span class="cx"> VM* vm = &exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(vm, exec);
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(*vm);
</ins><span class="cx">
</span><span class="cx"> JSValue op1 = JSValue::decode(encodedOp1);
</span><span class="cx"> JSValue op2 = JSValue::decode(encodedOp2);
</span><span class="cx">
</span><span class="cx"> int32_t a = op1.toInt32(exec);
</span><del>- if (UNLIKELY(vm->exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> int32_t b = op2.toInt32(exec);
</span><span class="cx"> return JSValue::encode(jsNumber(a ^ b));
</span><span class="lines">@@ -254,12 +259,13 @@
</span><span class="cx"> {
</span><span class="cx"> VM* vm = &exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(vm, exec);
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(*vm);
</ins><span class="cx">
</span><span class="cx"> JSValue op1 = JSValue::decode(encodedOp1);
</span><span class="cx"> JSValue op2 = JSValue::decode(encodedOp2);
</span><span class="cx">
</span><span class="cx"> int32_t a = op1.toInt32(exec);
</span><del>- if (UNLIKELY(vm->exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> uint32_t b = op2.toUInt32(exec);
</span><span class="cx"> return JSValue::encode(jsNumber(a << (b & 0x1f)));
</span><span class="lines">@@ -269,12 +275,13 @@
</span><span class="cx"> {
</span><span class="cx"> VM* vm = &exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(vm, exec);
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(*vm);
</ins><span class="cx">
</span><span class="cx"> JSValue op1 = JSValue::decode(encodedOp1);
</span><span class="cx"> JSValue op2 = JSValue::decode(encodedOp2);
</span><span class="cx">
</span><span class="cx"> int32_t a = op1.toInt32(exec);
</span><del>- if (UNLIKELY(vm->exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> uint32_t b = op2.toUInt32(exec);
</span><span class="cx"> return JSValue::encode(jsNumber(a >> (b & 0x1f)));
</span><span class="lines">@@ -284,12 +291,13 @@
</span><span class="cx"> {
</span><span class="cx"> VM* vm = &exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(vm, exec);
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(*vm);
</ins><span class="cx">
</span><span class="cx"> JSValue op1 = JSValue::decode(encodedOp1);
</span><span class="cx"> JSValue op2 = JSValue::decode(encodedOp2);
</span><span class="cx">
</span><span class="cx"> uint32_t a = op1.toUInt32(exec);
</span><del>- if (UNLIKELY(vm->exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> uint32_t b = op2.toUInt32(exec);
</span><span class="cx"> return JSValue::encode(jsNumber(static_cast<int32_t>(a >> (b & 0x1f))));
</span><span class="lines">@@ -315,12 +323,13 @@
</span><span class="cx"> {
</span><span class="cx"> VM* vm = &exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(vm, exec);
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(*vm);
</ins><span class="cx">
</span><span class="cx"> JSValue op1 = JSValue::decode(encodedOp1);
</span><span class="cx"> JSValue op2 = JSValue::decode(encodedOp2);
</span><span class="cx">
</span><span class="cx"> double a = op1.toNumber(exec);
</span><del>- if (UNLIKELY(vm->exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> double b = op2.toNumber(exec);
</span><span class="cx"> return JSValue::encode(jsNumber(a / b));
</span><span class="lines">@@ -330,10 +339,11 @@
</span><span class="cx"> {
</span><span class="cx"> VM* vm = &exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(vm, exec);
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(*vm);
</ins><span class="cx">
</span><span class="cx"> JSValue op1 = JSValue::decode(encodedOp1);
</span><span class="cx"> double a = op1.toNumber(exec);
</span><del>- if (UNLIKELY(vm->exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return PNaN;
</span><span class="cx"> return fabs(a);
</span><span class="cx"> }
</span><span class="lines">@@ -342,10 +352,11 @@
</span><span class="cx"> {
</span><span class="cx"> VM* vm = &exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(vm, exec);
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(*vm);
</ins><span class="cx">
</span><span class="cx"> JSValue op1 = JSValue::decode(encodedOp1);
</span><span class="cx"> uint32_t value = op1.toUInt32(exec);
</span><del>- if (UNLIKELY(vm->exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return 0;
</span><span class="cx"> return clz32(value);
</span><span class="cx"> }
</span><span class="lines">@@ -354,10 +365,11 @@
</span><span class="cx"> {
</span><span class="cx"> VM* vm = &exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(vm, exec);
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(*vm);
</ins><span class="cx">
</span><span class="cx"> JSValue op1 = JSValue::decode(encodedOp1);
</span><span class="cx"> double a = op1.toNumber(exec);
</span><del>- if (UNLIKELY(vm->exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> return cos(a);
</span><span class="cx"> }
</span><span class="lines">@@ -366,10 +378,11 @@
</span><span class="cx"> {
</span><span class="cx"> VM* vm = &exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(vm, exec);
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(*vm);
</ins><span class="cx">
</span><span class="cx"> JSValue op1 = JSValue::decode(encodedOp1);
</span><span class="cx"> double a = op1.toNumber(exec);
</span><del>- if (UNLIKELY(vm->exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return PNaN;
</span><span class="cx"> return static_cast<float>(a);
</span><span class="cx"> }
</span><span class="lines">@@ -378,10 +391,11 @@
</span><span class="cx"> {
</span><span class="cx"> VM* vm = &exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(vm, exec);
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(*vm);
</ins><span class="cx">
</span><span class="cx"> JSValue op1 = JSValue::decode(encodedOp1);
</span><span class="cx"> double a = op1.toNumber(exec);
</span><del>- if (UNLIKELY(vm->exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return PNaN;
</span><span class="cx"> return log(a);
</span><span class="cx"> }
</span><span class="lines">@@ -390,10 +404,11 @@
</span><span class="cx"> {
</span><span class="cx"> VM* vm = &exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(vm, exec);
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(*vm);
</ins><span class="cx">
</span><span class="cx"> JSValue op1 = JSValue::decode(encodedOp1);
</span><span class="cx"> double a = op1.toNumber(exec);
</span><del>- if (UNLIKELY(vm->exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return PNaN;
</span><span class="cx"> return sin(a);
</span><span class="cx"> }
</span><span class="lines">@@ -402,10 +417,11 @@
</span><span class="cx"> {
</span><span class="cx"> VM* vm = &exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(vm, exec);
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(*vm);
</ins><span class="cx">
</span><span class="cx"> JSValue op1 = JSValue::decode(encodedOp1);
</span><span class="cx"> double a = op1.toNumber(exec);
</span><del>- if (UNLIKELY(vm->exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return PNaN;
</span><span class="cx"> return sqrt(a);
</span><span class="cx"> }
</span><span class="lines">@@ -431,7 +447,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(&vm, exec);
</span><del>-
</del><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> JSValue baseValue = JSValue::decode(encodedBase);
</span><span class="cx"> JSValue property = JSValue::decode(encodedProperty);
</span><span class="cx">
</span><span class="lines">@@ -457,10 +474,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> baseValue.requireObjectCoercible(exec);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto propertyName = property.toPropertyKey(exec);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> return JSValue::encode(baseValue.get(exec, propertyName));
</span><span class="cx"> }
</span><span class="lines">@@ -469,7 +486,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(&vm, exec);
</span><del>-
</del><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> JSValue property = JSValue::decode(encodedProperty);
</span><span class="cx">
</span><span class="cx"> if (property.isUInt32())
</span><span class="lines">@@ -490,7 +508,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> auto propertyName = property.toPropertyKey(exec);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> return JSValue::encode(JSValue(base).get(exec, propertyName));
</span><span class="cx"> }
</span><span class="lines">@@ -859,6 +877,7 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(&vm, exec);
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx">
</span><span class="cx"> JSValue baseValue = JSValue::decode(encodedBase);
</span><span class="cx"> JSValue thisVal = JSValue::decode(encodedThis);
</span><span class="lines">@@ -884,11 +903,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> baseValue.requireObjectCoercible(exec);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx">
</span><span class="cx"> auto property = subscript.toPropertyKey(exec);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> return JSValue::encode(baseValue.get(exec, property, slot));
</span><span class="cx"> }
</span><span class="lines">@@ -913,9 +932,10 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(&vm, exec);
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx">
</span><span class="cx"> Identifier property = JSValue::decode(encodedSubscript).toPropertyKey(exec);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> putWithThis<true>(exec, encodedBase, encodedThis, encodedValue, property);
</span><span class="cx"> }
</span><span class="lines">@@ -924,9 +944,10 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(&vm, exec);
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx">
</span><span class="cx"> Identifier property = JSValue::decode(encodedSubscript).toPropertyKey(exec);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> putWithThis<false>(exec, encodedBase, encodedThis, encodedValue, property);
</span><span class="cx"> }
</span><span class="lines">@@ -1441,9 +1462,9 @@
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> JSString* str1 = JSValue::decode(a).toString(exec);
</span><del>- ASSERT(!vm.exception()); // Impossible, since we must have been given primitives.
</del><ins>+ ASSERT(!scope.exception()); // Impossible, since we must have been given primitives.
</ins><span class="cx"> JSString* str2 = JSValue::decode(b).toString(exec);
</span><del>- ASSERT(!vm.exception());
</del><ins>+ ASSERT(!scope.exception());
</ins><span class="cx">
</span><span class="cx"> if (sumOverflows<int32_t>(str1->length(), str2->length())) {
</span><span class="cx"> throwOutOfMemoryError(exec, scope);
</span><span class="lines">@@ -1460,11 +1481,11 @@
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> JSString* str1 = JSValue::decode(a).toString(exec);
</span><del>- ASSERT(!vm.exception()); // Impossible, since we must have been given primitives.
</del><ins>+ ASSERT(!scope.exception()); // Impossible, since we must have been given primitives.
</ins><span class="cx"> JSString* str2 = JSValue::decode(b).toString(exec);
</span><del>- ASSERT(!vm.exception());
</del><ins>+ ASSERT(!scope.exception());
</ins><span class="cx"> JSString* str3 = JSValue::decode(c).toString(exec);
</span><del>- ASSERT(!vm.exception());
</del><ins>+ ASSERT(!scope.exception());
</ins><span class="cx">
</span><span class="cx"> if (sumOverflows<int32_t>(str1->length(), str2->length(), str3->length())) {
</span><span class="cx"> throwOutOfMemoryError(exec, scope);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInjectedScriptManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InjectedScriptManager.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InjectedScriptManager.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/inspector/InjectedScriptManager.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -134,7 +134,9 @@
</span><span class="cx">
</span><span class="cx"> JSC::JSObject* InjectedScriptManager::createInjectedScript(const String& source, ExecState* scriptState, int id)
</span><span class="cx"> {
</span><del>- JSLockHolder lock(scriptState);
</del><ins>+ VM& vm = scriptState->vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
</ins><span class="cx">
</span><span class="cx"> SourceCode sourceCode = makeSource(source);
</span><span class="cx"> JSGlobalObject* globalObject = scriptState->lexicalGlobalObject();
</span><span class="lines">@@ -157,7 +159,7 @@
</span><span class="cx"> args.append(jsNumber(id));
</span><span class="cx">
</span><span class="cx"> JSValue result = JSC::call(scriptState, functionValue, callType, callData, globalThisValue, args);
</span><del>- scriptState->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> return result.getObject();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSGlobalObjectInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -221,7 +221,9 @@
</span><span class="cx"> if (isTerminatedExecutionException(exception))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ErrorHandlingScope errorScope(exec->vm());
</del><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+ ErrorHandlingScope errorScope(vm);
</ins><span class="cx">
</span><span class="cx"> RefPtr<ScriptCallStack> callStack = createScriptCallStackFromException(exec, exception, ScriptCallStack::maxCallStackSizeToCapture);
</span><span class="cx"> if (includesNativeCallStackWhenReportingExceptions())
</span><span class="lines">@@ -230,7 +232,7 @@
</span><span class="cx"> // FIXME: <http://webkit.org/b/115087> Web Inspector: Should not evaluate JavaScript handling exceptions
</span><span class="cx"> // If this is a custom exception object, call toString on it to try and get a nice string representation for the exception.
</span><span class="cx"> String errorMessage = exception->value().toString(exec)->value(exec);
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx">
</span><span class="cx"> if (JSGlobalObjectConsoleClient::logToSystemConsole()) {
</span><span class="cx"> if (callStack->size()) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSInjectedScriptHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> return throwTypeError(exec, scope, ASCIILiteral("InjectedScriptHost.evaluateWithScopeExtension first argument must be a string."));
</span><span class="cx">
</span><span class="cx"> String program = scriptValue.toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> NakedPtr<Exception> exception;
</span><span class="lines">@@ -259,12 +259,13 @@
</span><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> VM& vm = exec->vm();
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSValue value = exec->uncheckedArgument(0);
</span><span class="cx">
</span><span class="cx"> if (JSPromise* promise = jsDynamicCast<JSPromise*>(value)) {
</span><span class="cx"> unsigned index = 0;
</span><span class="cx"> JSArray* array = constructEmptyArray(exec, nullptr);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> switch (promise->status(exec->vm())) {
</span><span class="cx"> case JSPromise::Status::Pending:
</span><span class="lines">@@ -286,7 +287,7 @@
</span><span class="cx"> if (JSBoundFunction* boundFunction = jsDynamicCast<JSBoundFunction*>(value)) {
</span><span class="cx"> unsigned index = 0;
</span><span class="cx"> JSArray* array = constructEmptyArray(exec, nullptr);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> array->putDirectIndex(exec, index++, constructInternalProperty(exec, "targetFunction", boundFunction->targetFunction()));
</span><span class="cx"> array->putDirectIndex(exec, index++, constructInternalProperty(exec, "boundThis", boundFunction->boundThis()));
</span><span class="lines">@@ -298,7 +299,7 @@
</span><span class="cx"> if (ProxyObject* proxy = jsDynamicCast<ProxyObject*>(value)) {
</span><span class="cx"> unsigned index = 0;
</span><span class="cx"> JSArray* array = constructEmptyArray(exec, nullptr, 2);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> array->putDirectIndex(exec, index++, constructInternalProperty(exec, ASCIILiteral("target"), proxy->target()));
</span><span class="cx"> array->putDirectIndex(exec, index++, constructInternalProperty(exec, ASCIILiteral("handler"), proxy->handler()));
</span><span class="lines">@@ -312,7 +313,7 @@
</span><span class="cx">
</span><span class="cx"> unsigned index = 0;
</span><span class="cx"> JSArray* array = constructEmptyArray(exec, nullptr, 2);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> array->putDirectIndex(exec, index++, constructInternalProperty(exec, "array", iteratedValue));
</span><span class="cx"> array->putDirectIndex(exec, index++, constructInternalProperty(exec, "kind", kind));
</span><span class="lines">@@ -335,7 +336,7 @@
</span><span class="cx"> }
</span><span class="cx"> unsigned index = 0;
</span><span class="cx"> JSArray* array = constructEmptyArray(exec, nullptr, 2);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> array->putDirectIndex(exec, index++, constructInternalProperty(exec, "map", mapIterator->iteratedValue()));
</span><span class="cx"> array->putDirectIndex(exec, index++, constructInternalProperty(exec, "kind", jsNontrivialString(exec, kind)));
</span><span class="lines">@@ -357,7 +358,7 @@
</span><span class="cx"> }
</span><span class="cx"> unsigned index = 0;
</span><span class="cx"> JSArray* array = constructEmptyArray(exec, nullptr, 2);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> array->putDirectIndex(exec, index++, constructInternalProperty(exec, "set", setIterator->iteratedValue()));
</span><span class="cx"> array->putDirectIndex(exec, index++, constructInternalProperty(exec, "kind", jsNontrivialString(exec, kind)));
</span><span class="lines">@@ -367,7 +368,7 @@
</span><span class="cx"> if (JSStringIterator* stringIterator = jsDynamicCast<JSStringIterator*>(value)) {
</span><span class="cx"> unsigned index = 0;
</span><span class="cx"> JSArray* array = constructEmptyArray(exec, nullptr, 1);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> array->putDirectIndex(exec, index++, constructInternalProperty(exec, "string", stringIterator->iteratedValue(exec)));
</span><span class="cx"> return array;
</span><span class="lines">@@ -376,7 +377,7 @@
</span><span class="cx"> if (JSPropertyNameIterator* propertyNameIterator = jsDynamicCast<JSPropertyNameIterator*>(value)) {
</span><span class="cx"> unsigned index = 0;
</span><span class="cx"> JSArray* array = constructEmptyArray(exec, nullptr, 1);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> array->putDirectIndex(exec, index++, constructInternalProperty(exec, "object", propertyNameIterator->iteratedValue()));
</span><span class="cx"> return array;
</span><span class="lines">@@ -404,6 +405,7 @@
</span><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> VM& vm = exec->vm();
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSValue value = exec->uncheckedArgument(0);
</span><span class="cx"> JSWeakMap* weakMap = jsDynamicCast<JSWeakMap*>(value);
</span><span class="cx"> if (!weakMap)
</span><span class="lines">@@ -418,7 +420,7 @@
</span><span class="cx"> numberToFetch = static_cast<unsigned>(fetchDouble);
</span><span class="cx">
</span><span class="cx"> JSArray* array = constructEmptyArray(exec, nullptr);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> for (auto it = weakMap->weakMapData()->begin(); it != weakMap->weakMapData()->end(); ++it) {
</span><span class="cx"> JSObject* entry = constructEmptyObject(exec);
</span><span class="lines">@@ -451,6 +453,7 @@
</span><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> VM& vm = exec->vm();
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSValue value = exec->uncheckedArgument(0);
</span><span class="cx"> JSWeakSet* weakSet = jsDynamicCast<JSWeakSet*>(value);
</span><span class="cx"> if (!weakSet)
</span><span class="lines">@@ -465,7 +468,7 @@
</span><span class="cx"> numberToFetch = static_cast<unsigned>(fetchDouble);
</span><span class="cx">
</span><span class="cx"> JSArray* array = constructEmptyArray(exec, nullptr);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> for (auto it = weakSet->weakMapData()->begin(); it != weakSet->weakMapData()->end(); ++it) {
</span><span class="cx"> JSObject* entry = constructEmptyObject(exec);
</span><span class="lines">@@ -495,6 +498,7 @@
</span><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> VM& vm = exec->vm();
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSValue iterator;
</span><span class="cx"> JSValue value = exec->uncheckedArgument(0);
</span><span class="cx"> if (JSMapIterator* mapIterator = jsDynamicCast<JSMapIterator*>(value))
</span><span class="lines">@@ -505,7 +509,7 @@
</span><span class="cx"> iterator = stringIterator->clone(exec);
</span><span class="cx"> else if (JSPropertyNameIterator* propertyNameIterator = jsDynamicCast<JSPropertyNameIterator*>(value)) {
</span><span class="cx"> iterator = propertyNameIterator->clone(exec);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue();
</span><span class="cx"> } else {
</span><span class="cx"> if (JSObject* iteratorObject = jsDynamicCast<JSObject*>(value)) {
</span><span class="lines">@@ -525,18 +529,18 @@
</span><span class="cx"> numberToFetch = static_cast<unsigned>(fetchDouble);
</span><span class="cx">
</span><span class="cx"> JSArray* array = constructEmptyArray(exec, nullptr);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < numberToFetch; ++i) {
</span><span class="cx"> JSValue next = iteratorStep(exec, iterator);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> break;
</span><span class="cx"> if (next.isFalse())
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> JSValue nextValue = iteratorValue(exec, next);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> JSObject* entry = constructEmptyObject(exec);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSJavaScriptCallFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> return throwTypeError(exec, scope, ASCIILiteral("JSJavaScriptCallFrame.evaluateWithScopeExtension first argument must be a string."));
</span><span class="cx">
</span><span class="cx"> String script = scriptValue.toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> NakedPtr<Exception> exception;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorScriptCallStackFactorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ScriptCallStackFactory.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ScriptCallStackFactory.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/inspector/ScriptCallStackFactory.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -119,6 +119,9 @@
</span><span class="cx">
</span><span class="cx"> static void extractSourceInformationFromException(JSC::ExecState* exec, JSObject* exceptionObject, int* lineNumber, int* columnNumber, String* sourceURL)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
</ins><span class="cx"> // FIXME: <http://webkit.org/b/115087> Web Inspector: Should not need to evaluate JavaScript handling exceptions
</span><span class="cx"> JSValue lineValue = exceptionObject->getDirect(exec->vm(), Identifier::fromString(exec, "line"));
</span><span class="cx"> *lineNumber = lineValue && lineValue.isNumber() ? int(lineValue.toNumber(exec)) : 0;
</span><span class="lines">@@ -126,7 +129,7 @@
</span><span class="cx"> *columnNumber = columnValue && columnValue.isNumber() ? int(columnValue.toNumber(exec)) : 0;
</span><span class="cx"> JSValue sourceURLValue = exceptionObject->getDirect(exec->vm(), Identifier::fromString(exec, "sourceURL"));
</span><span class="cx"> *sourceURL = sourceURLValue && sourceURLValue.isString() ? sourceURLValue.toString(exec)->value(exec) : ASCIILiteral("undefined");
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<ScriptCallStack> createScriptCallStackFromException(JSC::ExecState* exec, JSC::Exception* exception, size_t maxStackSize)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterCachedCallh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/CachedCall.h (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/CachedCall.h 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/interpreter/CachedCall.h 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> m_closure = m_interpreter->prepareForRepeatCall(function->jsExecutable(), callFrame, &m_protoCallFrame, function, argumentCount + 1, function->scope(), m_arguments.data());
</span><span class="cx"> } else
</span><span class="cx"> throwStackOverflowError(callFrame, scope);
</span><del>- m_valid = !callFrame->hadException();
</del><ins>+ m_valid = !scope.exception();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue call()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterCallFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/CallFrame.h (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/CallFrame.h 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/interpreter/CallFrame.h 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -116,14 +116,6 @@
</span><span class="cx"> // pointer, so these are inefficient, and should be used sparingly in new code.
</span><span class="cx"> // But they're used in many places in legacy code, so they're not going away any time soon.
</span><span class="cx">
</span><del>- void clearException() { vm().clearException(); }
-
- Exception* exception() const { return vm().exception(); }
- bool hadException() const { return !!vm().exception(); }
-
- Exception* lastException() const { return vm().lastException(); }
- void clearLastException() { vm().clearLastException(); }
-
</del><span class="cx"> AtomicStringTable* atomicStringTable() const { return vm().atomicStringTable(); }
</span><span class="cx"> const CommonIdentifiers& propertyNames() const { return *vm().propertyNames; }
</span><span class="cx"> const MarkedArgumentBuffer& emptyList() const { return *vm().emptyList; }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterInterpretercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="cx"> String programSource = asString(program)->value(callFrame);
</span><del>- if (callFrame->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue();
</span><span class="cx">
</span><span class="cx"> CallFrame* callerFrame = callFrame->callerFrame();
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If the literal parser bailed, it should not have thrown exceptions.
</span><del>- ASSERT(!vm.exception());
</del><ins>+ ASSERT(!scope.exception());
</ins><span class="cx">
</span><span class="cx"> eval = callerCodeBlock->evalCodeCache().getSlow(callFrame, callerCodeBlock, callerCodeBlock->isStrictMode(), derivedContextType, evalContextType, isArrowFunctionContext, programSource, callerScopeChain);
</span><span class="cx">
</span><span class="lines">@@ -188,7 +188,7 @@
</span><span class="cx"> default:
</span><span class="cx"> RELEASE_ASSERT(arguments.isObject());
</span><span class="cx"> length = getLength(callFrame, jsCast<JSObject*>(cell));
</span><del>- if (UNLIKELY(callFrame->hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return 0;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -586,13 +586,15 @@
</span><span class="cx">
</span><span class="cx"> ALWAYS_INLINE static void notifyDebuggerOfUnwinding(CallFrame* callFrame)
</span><span class="cx"> {
</span><ins>+ VM& vm = callFrame->vm();
+ auto throwScope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> if (Debugger* debugger = callFrame->vmEntryGlobalObject()->debugger()) {
</span><del>- SuspendExceptionScope scope(&callFrame->vm());
</del><ins>+ SuspendExceptionScope scope(&vm);
</ins><span class="cx"> if (jsDynamicCast<JSFunction*>(callFrame->callee()))
</span><span class="cx"> debugger->returnEvent(callFrame);
</span><span class="cx"> else
</span><span class="cx"> debugger->didExecuteProgram(callFrame);
</span><del>- ASSERT(!callFrame->hadException());
</del><ins>+ ASSERT_UNUSED(throwScope, !throwScope.exception());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -680,6 +682,8 @@
</span><span class="cx">
</span><span class="cx"> NEVER_INLINE HandlerInfo* Interpreter::unwind(VM& vm, CallFrame*& callFrame, Exception* exception, UnwindStart unwindStart)
</span><span class="cx"> {
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> if (unwindStart == UnwindFromCallerFrame) {
</span><span class="cx"> if (callFrame->callerFrameOrVMEntryFrame() == vm.topVMEntryFrame)
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -698,7 +702,7 @@
</span><span class="cx"> if (exceptionValue.isEmpty() || (exceptionValue.isCell() && !exceptionValue.asCell()))
</span><span class="cx"> exceptionValue = jsNull();
</span><span class="cx">
</span><del>- ASSERT(vm.exception() && vm.exception()->stack().size());
</del><ins>+ ASSERT_UNUSED(scope, scope.exception() && scope.exception()->stack().size());
</ins><span class="cx">
</span><span class="cx"> // Calculate an exception handler vPC, unwinding call frames as necessary.
</span><span class="cx"> HandlerInfo* handler = nullptr;
</span><span class="lines">@@ -897,7 +901,7 @@
</span><span class="cx">
</span><span class="cx"> // Execute the code:
</span><span class="cx"> JSValue result = program->generatedJITCode()->execute(&vm, &protoCallFrame);
</span><del>-
</del><ins>+ throwScope.release();
</ins><span class="cx"> return checkedReturn(result);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -906,7 +910,7 @@
</span><span class="cx"> VM& vm = callFrame->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><del>- ASSERT(!callFrame->hadException());
</del><ins>+ ASSERT(!throwScope.exception());
</ins><span class="cx"> ASSERT(!vm.isCollectorBusy());
</span><span class="cx"> if (vm.isCollectorBusy())
</span><span class="cx"> return jsNull();
</span><span class="lines">@@ -969,7 +973,7 @@
</span><span class="cx"> VM& vm = callFrame->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><del>- ASSERT(!callFrame->hadException());
</del><ins>+ ASSERT(!throwScope.exception());
</ins><span class="cx"> ASSERT(!vm.isCollectorBusy());
</span><span class="cx"> // We throw in this case because we have to return something "valid" but we're
</span><span class="cx"> // already in an invalid state.
</span><span class="lines">@@ -1020,12 +1024,12 @@
</span><span class="cx"> else {
</span><span class="cx"> result = JSValue::decode(vmEntryToNative(reinterpret_cast<void*>(constructData.native.function), &vm, &protoCallFrame));
</span><span class="cx">
</span><del>- if (!callFrame->hadException())
</del><ins>+ if (LIKELY(!throwScope.exception()))
</ins><span class="cx"> RELEASE_ASSERT(result.isObject());
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (callFrame->hadException())
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return 0;
</span><span class="cx"> ASSERT(result.isObject());
</span><span class="cx"> return checkedReturn(asObject(result));
</span><span class="lines">@@ -1035,7 +1039,7 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = *scope->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- ASSERT(!vm.exception());
</del><ins>+ ASSERT(!throwScope.exception());
</ins><span class="cx">
</span><span class="cx"> if (vm.isCollectorBusy())
</span><span class="cx"> return CallFrameClosure();
</span><span class="lines">@@ -1084,7 +1088,7 @@
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> ASSERT(scope->vm() == &callFrame->vm());
</span><del>- ASSERT(!vm.exception());
</del><ins>+ ASSERT(!throwScope.exception());
</ins><span class="cx"> ASSERT(!vm.isCollectorBusy());
</span><span class="cx"> RELEASE_ASSERT(vm.currentThreadIsHoldingAPILock());
</span><span class="cx"> if (vm.isCollectorBusy())
</span><span class="lines">@@ -1190,7 +1194,7 @@
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> ASSERT(scope->vm() == &callFrame->vm());
</span><del>- ASSERT(!vm.exception());
</del><ins>+ ASSERT(!throwScope.exception());
</ins><span class="cx"> ASSERT(!vm.isCollectorBusy());
</span><span class="cx"> RELEASE_ASSERT(vm.currentThreadIsHoldingAPILock());
</span><span class="cx"> if (vm.isCollectorBusy())
</span><span class="lines">@@ -1231,12 +1235,14 @@
</span><span class="cx">
</span><span class="cx"> NEVER_INLINE void Interpreter::debug(CallFrame* callFrame, DebugHookID debugHookID)
</span><span class="cx"> {
</span><ins>+ VM& vm = callFrame->vm();
+ auto scope = DECLARE_CATCH_SCOPE(vm);
</ins><span class="cx"> Debugger* debugger = callFrame->vmEntryGlobalObject()->debugger();
</span><span class="cx"> if (!debugger)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> ASSERT(callFrame->codeBlock()->hasDebuggerRequests());
</span><del>- ASSERT(!callFrame->hadException());
</del><ins>+ ASSERT_UNUSED(scope, !scope.exception());
</ins><span class="cx">
</span><span class="cx"> switch (debugHookID) {
</span><span class="cx"> case DidEnterCallFrame:
</span><span class="lines">@@ -1258,7 +1264,7 @@
</span><span class="cx"> debugger->didReachBreakpoint(callFrame);
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- ASSERT(!callFrame->hadException());
-}
</del><ins>+ ASSERT(!scope.exception());
+}
</ins><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterInterpreterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/Interpreter.h (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/Interpreter.h 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/interpreter/Interpreter.h 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #define Interpreter_h
</span><span class="cx">
</span><span class="cx"> #include "ArgList.h"
</span><ins>+#include "CatchScope.h"
</ins><span class="cx"> #include "JSCJSValue.h"
</span><span class="cx"> #include "JSCell.h"
</span><span class="cx"> #include "JSObject.h"
</span><span class="lines">@@ -38,6 +39,7 @@
</span><span class="cx"> #include "SourceProvider.h"
</span><span class="cx"> #include "StackAlignment.h"
</span><span class="cx"> #include "StackFrame.h"
</span><ins>+#include "ThrowScope.h"
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><span class="lines">@@ -92,8 +94,9 @@
</span><span class="cx"> SuspendExceptionScope(VM* vm)
</span><span class="cx"> : m_vm(vm)
</span><span class="cx"> {
</span><del>- oldException = vm->exception();
- vm->clearException();
</del><ins>+ auto scope = DECLARE_CATCH_SCOPE(*vm);
+ oldException = scope.exception();
+ scope.clearException();
</ins><span class="cx"> }
</span><span class="cx"> ~SuspendExceptionScope()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterShadowChickencpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/ShadowChicken.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/ShadowChicken.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/interpreter/ShadowChicken.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -436,8 +436,9 @@
</span><span class="cx"> JSArray* ShadowChicken::functionsOnStack(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSArray* result = constructEmptyArray(exec, 0);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> iterate(
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITCodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITCode.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITCode.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/jit/JITCode.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -69,6 +69,7 @@
</span><span class="cx">
</span><span class="cx"> JSValue JITCode::execute(VM* vm, ProtoCallFrame* protoCallFrame)
</span><span class="cx"> {
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(*vm);
</ins><span class="cx"> void* entryAddress;
</span><span class="cx"> JSFunction* function = jsDynamicCast<JSFunction*>(protoCallFrame->callee());
</span><span class="cx">
</span><span class="lines">@@ -78,7 +79,7 @@
</span><span class="cx"> } else
</span><span class="cx"> entryAddress = addressForCall(MustCheckArity).executableAddress();
</span><span class="cx"> JSValue result = JSValue::decode(vmEntryToJavaScript(entryAddress, vm, protoCallFrame));
</span><del>- return vm->exception() ? jsNull() : result;
</del><ins>+ return scope.exception() ? jsNull() : result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DFG::CommonData* JITCode::dfgCommon()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITExceptionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITExceptions.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITExceptions.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/jit/JITExceptions.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx">
</span><span class="cx"> void genericUnwind(VM* vm, ExecState* callFrame, UnwindStart unwindStart)
</span><span class="cx"> {
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(*vm);
</ins><span class="cx"> if (Options::breakOnThrow()) {
</span><span class="cx"> CodeBlock* codeBlock = callFrame->codeBlock();
</span><span class="cx"> if (codeBlock)
</span><span class="lines">@@ -58,7 +59,7 @@
</span><span class="cx"> }
</span><span class="cx"> vm->shadowChicken().log(*vm, shadowChickenTopFrame, ShadowChicken::Packet::throwPacket());
</span><span class="cx">
</span><del>- Exception* exception = vm->exception();
</del><ins>+ Exception* exception = scope.exception();
</ins><span class="cx"> RELEASE_ASSERT(exception);
</span><span class="cx"> HandlerInfo* handler = vm->interpreter->unwind(*vm, callFrame, exception, unwindStart); // This may update callFrame.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOperationscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOperations.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOperations.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/jit/JITOperations.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -275,7 +275,7 @@
</span><span class="cx"> LOG_IC((ICEvent::OperationInOptimize, base->classInfo(), ident));
</span><span class="cx"> PropertySlot slot(base, PropertySlot::InternalMethodType::HasProperty);
</span><span class="cx"> bool result = asObject(base)->getPropertySlot(exec, ident, slot);
</span><del>- if (vm->exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> RELEASE_ASSERT(accessType == stubInfo->accessType);
</span><span class="lines">@@ -489,6 +489,7 @@
</span><span class="cx"> static void putByVal(CallFrame* callFrame, JSValue baseValue, JSValue subscript, JSValue value, ByValInfo* byValInfo)
</span><span class="cx"> {
</span><span class="cx"> VM& vm = callFrame->vm();
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> if (LIKELY(subscript.isUInt32())) {
</span><span class="cx"> byValInfo->tookSlowPath = true;
</span><span class="cx"> uint32_t i = subscript.asUInt32();
</span><span class="lines">@@ -510,7 +511,7 @@
</span><span class="cx">
</span><span class="cx"> auto property = subscript.toPropertyKey(callFrame);
</span><span class="cx"> // Don't put to an object if toString threw an exception.
</span><del>- if (callFrame->vm().exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (byValInfo->stubInfo && (!isStringOrSymbol(subscript) || byValInfo->cachedId != property))
</span><span class="lines">@@ -522,6 +523,8 @@
</span><span class="cx">
</span><span class="cx"> static void directPutByVal(CallFrame* callFrame, JSObject* baseObject, JSValue subscript, JSValue value, ByValInfo* byValInfo)
</span><span class="cx"> {
</span><ins>+ VM& vm = callFrame->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> bool isStrictMode = callFrame->codeBlock()->isStrictMode();
</span><span class="cx"> if (LIKELY(subscript.isUInt32())) {
</span><span class="cx"> // Despite its name, JSValue::isUInt32 will return true only for positive boxed int32_t; all those values are valid array indices.
</span><span class="lines">@@ -553,7 +556,7 @@
</span><span class="cx">
</span><span class="cx"> // Don't put to an object if toString threw an exception.
</span><span class="cx"> auto property = subscript.toPropertyKey(callFrame);
</span><del>- if (callFrame->vm().exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (Optional<uint32_t> index = parseIndex(property)) {
</span><span class="lines">@@ -774,7 +777,8 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JIT_OPERATION operationCallEval(ExecState* exec, ExecState* execCallee)
</span><span class="cx"> {
</span><del>- UNUSED_PARAM(exec);
</del><ins>+ VM* vm = &exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(*vm);
</ins><span class="cx">
</span><span class="cx"> execCallee->setCodeBlock(0);
</span><span class="cx">
</span><span class="lines">@@ -781,9 +785,8 @@
</span><span class="cx"> if (!isHostFunction(execCallee->calleeAsValue(), globalFuncEval))
</span><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx">
</span><del>- VM* vm = &execCallee->vm();
</del><span class="cx"> JSValue result = eval(execCallee);
</span><del>- if (vm->exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return EncodedJSValue();
</span><span class="cx">
</span><span class="cx"> return JSValue::encode(result);
</span><span class="lines">@@ -807,7 +810,7 @@
</span><span class="cx"> NativeCallFrameTracer tracer(vm, execCallee);
</span><span class="cx"> execCallee->setCallee(asObject(callee));
</span><span class="cx"> vm->hostCallReturnValue = JSValue::decode(callData.native.function(execCallee));
</span><del>- if (vm->exception()) {
</del><ins>+ if (UNLIKELY(scope.exception())) {
</ins><span class="cx"> return encodeResult(
</span><span class="cx"> vm->getCTIStub(throwExceptionFromCallSlowPathGenerator).code().executableAddress(),
</span><span class="cx"> reinterpret_cast<void*>(KeepTheFrame));
</span><span class="lines">@@ -836,7 +839,7 @@
</span><span class="cx"> NativeCallFrameTracer tracer(vm, execCallee);
</span><span class="cx"> execCallee->setCallee(asObject(callee));
</span><span class="cx"> vm->hostCallReturnValue = JSValue::decode(constructData.native.function(execCallee));
</span><del>- if (vm->exception()) {
</del><ins>+ if (UNLIKELY(scope.exception())) {
</ins><span class="cx"> return encodeResult(
</span><span class="cx"> vm->getCTIStub(throwExceptionFromCallSlowPathGenerator).code().executableAddress(),
</span><span class="cx"> reinterpret_cast<void*>(KeepTheFrame));
</span><span class="lines">@@ -1462,8 +1465,10 @@
</span><span class="cx">
</span><span class="cx"> static void putAccessorByVal(ExecState* exec, JSObject* base, JSValue subscript, int32_t attribute, JSObject* accessor, AccessorType accessorType)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> auto propertyKey = subscript.toPropertyKey(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (accessorType == AccessorType::Getter)
</span><span class="lines">@@ -1608,8 +1613,10 @@
</span><span class="cx">
</span><span class="cx"> static JSValue getByVal(ExecState* exec, JSValue baseValue, JSValue subscript, ByValInfo* byValInfo, ReturnAddressPtr returnAddress)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> if (LIKELY(baseValue.isCell() && subscript.isString())) {
</span><del>- VM& vm = exec->vm();
</del><span class="cx"> Structure& structure = *baseValue.asCell()->structure(vm);
</span><span class="cx"> if (JSCell::canUseFastGetOwnProperty(structure)) {
</span><span class="cx"> if (RefPtr<AtomicStringImpl> existingAtomicString = asString(subscript)->toExistingAtomicString(exec)) {
</span><span class="lines">@@ -1651,10 +1658,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> baseValue.requireObjectCoercible(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> auto property = subscript.toPropertyKey(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> ASSERT(exec->bytecodeOffset());
</span><span class="lines">@@ -1845,6 +1852,7 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(&vm, exec);
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSValue baseValue = JSValue::decode(encodedBase);
</span><span class="cx"> JSValue subscript = JSValue::decode(encodedSubscript);
</span><span class="cx">
</span><span class="lines">@@ -1862,10 +1870,10 @@
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> baseValue.requireObjectCoercible(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto property = subscript.toPropertyKey(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> result = baseValue.get(exec, property);
</span><span class="cx"> }
</span><span class="lines">@@ -1914,10 +1922,10 @@
</span><span class="cx"> if (key.getUInt32(index))
</span><span class="cx"> couldDelete = baseObj->methodTable(vm)->deletePropertyByIndex(baseObj, exec, index);
</span><span class="cx"> else {
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> Identifier property = key.toPropertyKey(exec);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> couldDelete = baseObj->methodTable(vm)->deleteProperty(baseObj, exec, property);
</span><span class="cx"> }
</span><span class="lines">@@ -2122,7 +2130,7 @@
</span><span class="cx"> PutPropertySlot slot(scope, codeBlock->isStrictMode(), PutPropertySlot::UnknownContext, isInitialization(getPutInfo.initializationMode()));
</span><span class="cx"> scope->methodTable()->put(scope, exec, ident, value, slot);
</span><span class="cx">
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> CommonSlowPaths::tryCachePutToScopeGlobal(exec, codeBlock, pc, scope, getPutInfo, slot, ident);
</span><span class="lines">@@ -2371,11 +2379,12 @@
</span><span class="cx">
</span><span class="cx"> ALWAYS_INLINE static EncodedJSValue unprofiledMul(VM& vm, ExecState* exec, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2)
</span><span class="cx"> {
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSValue op1 = JSValue::decode(encodedOp1);
</span><span class="cx"> JSValue op2 = JSValue::decode(encodedOp2);
</span><span class="cx">
</span><span class="cx"> double a = op1.toNumber(exec);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> double b = op2.toNumber(exec);
</span><span class="cx"> return JSValue::encode(jsNumber(a * b));
</span><span class="lines">@@ -2383,6 +2392,7 @@
</span><span class="cx">
</span><span class="cx"> ALWAYS_INLINE static EncodedJSValue profiledMul(VM& vm, ExecState* exec, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2, ArithProfile* arithProfile, bool shouldObserveLHSAndRHSTypes = true)
</span><span class="cx"> {
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSValue op1 = JSValue::decode(encodedOp1);
</span><span class="cx"> JSValue op2 = JSValue::decode(encodedOp2);
</span><span class="cx">
</span><span class="lines">@@ -2390,10 +2400,10 @@
</span><span class="cx"> arithProfile->observeLHSAndRHS(op1, op2);
</span><span class="cx">
</span><span class="cx"> double a = op1.toNumber(exec);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> double b = op2.toNumber(exec);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx">
</span><span class="cx"> JSValue result = jsNumber(a * b);
</span><span class="lines">@@ -2468,11 +2478,12 @@
</span><span class="cx">
</span><span class="cx"> ALWAYS_INLINE static EncodedJSValue unprofiledSub(VM& vm, ExecState* exec, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2)
</span><span class="cx"> {
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSValue op1 = JSValue::decode(encodedOp1);
</span><span class="cx"> JSValue op2 = JSValue::decode(encodedOp2);
</span><span class="cx">
</span><span class="cx"> double a = op1.toNumber(exec);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> double b = op2.toNumber(exec);
</span><span class="cx"> return JSValue::encode(jsNumber(a - b));
</span><span class="lines">@@ -2480,6 +2491,7 @@
</span><span class="cx">
</span><span class="cx"> ALWAYS_INLINE static EncodedJSValue profiledSub(VM& vm, ExecState* exec, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2, ArithProfile* arithProfile, bool shouldObserveLHSAndRHSTypes = true)
</span><span class="cx"> {
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSValue op1 = JSValue::decode(encodedOp1);
</span><span class="cx"> JSValue op2 = JSValue::decode(encodedOp2);
</span><span class="cx">
</span><span class="lines">@@ -2487,10 +2499,10 @@
</span><span class="cx"> arithProfile->observeLHSAndRHS(op1, op2);
</span><span class="cx">
</span><span class="cx"> double a = op1.toNumber(exec);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> double b = op2.toNumber(exec);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx">
</span><span class="cx"> JSValue result = jsNumber(a - b);
</span><span class="lines">@@ -2580,13 +2592,14 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(&vm, exec);
</span><del>- RELEASE_ASSERT(!!vm.exception());
</del><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
+ RELEASE_ASSERT(!!scope.exception());
</ins><span class="cx">
</span><del>- if (isTerminatedExecutionException(vm.exception())) {
</del><ins>+ if (isTerminatedExecutionException(scope.exception())) {
</ins><span class="cx"> genericUnwind(&vm, exec);
</span><span class="cx"> return 1;
</span><del>- } else
- return 0;
</del><ins>+ }
+ return 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // extern "C"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejsccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jsc.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jsc.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/jsc.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -301,12 +301,14 @@
</span><span class="cx">
</span><span class="cx"> static bool getOwnPropertySlot(JSObject* object, ExecState* exec, PropertyName name, PropertySlot& slot)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> ImpureGetter* thisObject = jsCast<ImpureGetter*>(object);
</span><span class="cx">
</span><span class="cx"> if (thisObject->m_delegate) {
</span><span class="cx"> if (thisObject->m_delegate->getPropertySlot(exec, name, slot))
</span><span class="cx"> return true;
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1037,11 +1039,14 @@
</span><span class="cx">
</span><span class="cx"> JSInternalPromise* GlobalObject::moduleLoaderResolve(JSGlobalObject* globalObject, ExecState* exec, JSModuleLoader*, JSValue keyValue, JSValue referrerValue, JSValue)
</span><span class="cx"> {
</span><ins>+ VM& vm = globalObject->vm();
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
</ins><span class="cx"> JSInternalPromiseDeferred* deferred = JSInternalPromiseDeferred::create(exec, globalObject);
</span><span class="cx"> const Identifier key = keyValue.toPropertyKey(exec);
</span><del>- if (exec->hadException()) {
- JSValue exception = exec->exception();
- exec->clearException();
</del><ins>+ if (UNLIKELY(scope.exception())) {
+ JSValue exception = scope.exception();
+ scope.clearException();
</ins><span class="cx"> return deferred->reject(exec, exception);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1054,9 +1059,9 @@
</span><span class="cx"> return deferred->reject(exec, createError(exec, ASCIILiteral("Could not resolve the current working directory.")));
</span><span class="cx"> } else {
</span><span class="cx"> const Identifier referrer = referrerValue.toPropertyKey(exec);
</span><del>- if (exec->hadException()) {
- JSValue exception = exec->exception();
- exec->clearException();
</del><ins>+ if (UNLIKELY(scope.exception())) {
+ JSValue exception = scope.exception();
+ scope.clearException();
</ins><span class="cx"> return deferred->reject(exec, exception);
</span><span class="cx"> }
</span><span class="cx"> if (referrer.isSymbol()) {
</span><span class="lines">@@ -1142,11 +1147,13 @@
</span><span class="cx">
</span><span class="cx"> JSInternalPromise* GlobalObject::moduleLoaderFetch(JSGlobalObject* globalObject, ExecState* exec, JSModuleLoader*, JSValue key, JSValue)
</span><span class="cx"> {
</span><ins>+ VM& vm = globalObject->vm();
+ auto scope = DECLARE_CATCH_SCOPE(vm);
</ins><span class="cx"> JSInternalPromiseDeferred* deferred = JSInternalPromiseDeferred::create(exec, globalObject);
</span><span class="cx"> String moduleKey = key.toWTFString(exec);
</span><del>- if (exec->hadException()) {
- JSValue exception = exec->exception();
- exec->clearException();
</del><ins>+ if (UNLIKELY(scope.exception())) {
+ JSValue exception = scope.exception();
+ scope.clearException();
</ins><span class="cx"> return deferred->reject(exec, exception);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1257,9 +1264,9 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL functionCreateElement(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><ins>+ JSLockHolder lock(vm);
</ins><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><del>- JSLockHolder lock(exec);
</del><span class="cx"> Root* root = jsDynamicCast<Root*>(exec->argument(0));
</span><span class="cx"> if (!root)
</span><span class="cx"> return JSValue::encode(throwException(exec, scope, createError(exec, ASCIILiteral("Cannot create Element without a Root."))));
</span><span class="lines">@@ -1447,7 +1454,7 @@
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> String fileName = exec->argument(0).toWTFString(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> Vector<char> script;
</span><span class="cx"> if (!fetchScriptFromLocalFileSystem(fileName, script))
</span><span class="lines">@@ -1481,7 +1488,7 @@
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> String source = exec->argument(0).toWTFString(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> GlobalObject* globalObject = GlobalObject::create(vm, GlobalObject::createStructure(vm, jsNull()), Vector<String>());
</span><span class="lines">@@ -1509,7 +1516,7 @@
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> String fileName = exec->argument(0).toWTFString(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> Vector<char> script;
</span><span class="cx"> if (!fetchScriptFromLocalFileSystem(fileName, script))
</span><span class="lines">@@ -1530,7 +1537,7 @@
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> String sourceCode = exec->argument(0).toWTFString(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> JSGlobalObject* globalObject = exec->lexicalGlobalObject();
</span><span class="cx">
</span><span class="lines">@@ -1547,7 +1554,7 @@
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> String fileName = exec->argument(0).toWTFString(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> Vector<char> script;
</span><span class="cx"> if (!fillBufferWithContentsOfFile(fileName, script))
</span><span class="lines">@@ -1562,7 +1569,7 @@
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> String fileName = exec->argument(0).toWTFString(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> Vector<char> script;
</span><span class="cx"> if (!fetchScriptFromLocalFileSystem(fileName, script))
</span><span class="lines">@@ -1622,8 +1629,11 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL functionSetRandomSeed(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> unsigned seed = exec->argument(0).toUInt32(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> exec->lexicalGlobalObject()->weakRandom().setSeed(seed);
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -1876,7 +1886,7 @@
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> String fileName = exec->argument(0).toWTFString(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> Vector<char> script;
</span><span class="cx"> if (!fetchScriptFromLocalFileSystem(fileName, script))
</span><span class="lines">@@ -1883,7 +1893,7 @@
</span><span class="cx"> return JSValue::encode(throwException(exec, scope, createError(exec, ASCIILiteral("Could not open file."))));
</span><span class="cx">
</span><span class="cx"> JSInternalPromise* promise = loadAndEvaluateModule(exec, fileName);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> JSValue error;
</span><span class="lines">@@ -1901,14 +1911,16 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL functionCreateBuiltin(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> if (exec->argumentCount() < 1 || !exec->argument(0).isString())
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> String functionText = exec->argument(0).toWTFString(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx">
</span><del>- VM& vm = exec->vm();
</del><span class="cx"> const SourceCode& source = makeSource(functionText);
</span><span class="cx"> JSFunction* func = JSFunction::createBuiltinFunction(vm, createBuiltinExecutable(vm, source, Identifier::fromString(&vm, "foo"), ConstructorKind::None, ConstructAbility::CannotConstruct)->link(vm, source), exec->lexicalGlobalObject());
</span><span class="cx">
</span><span class="lines">@@ -1927,7 +1939,7 @@
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> String source = exec->argument(0).toWTFString(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> StopWatch stopWatch;
</span><span class="lines">@@ -1953,7 +1965,9 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL functionGenerateHeapSnapshot(ExecState* exec)
</span><span class="cx"> {
</span><del>- JSLockHolder lock(exec);
</del><ins>+ VM& vm = exec->vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx">
</span><span class="cx"> HeapSnapshotBuilder snapshotBuilder(exec->vm().ensureHeapProfiler());
</span><span class="cx"> snapshotBuilder.buildSnapshot();
</span><span class="lines">@@ -1960,7 +1974,7 @@
</span><span class="cx">
</span><span class="cx"> String jsonString = snapshotBuilder.json();
</span><span class="cx"> EncodedJSValue result = JSValue::encode(JSONParse(exec, jsonString));
</span><del>- RELEASE_ASSERT(!exec->hadException());
</del><ins>+ RELEASE_ASSERT(!scope.exception());
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1998,7 +2012,7 @@
</span><span class="cx">
</span><span class="cx"> String jsonString = vm.samplingProfiler()->stackTracesAsJSON();
</span><span class="cx"> EncodedJSValue result = JSValue::encode(JSONParse(exec, jsonString));
</span><del>- RELEASE_ASSERT(!exec->hadException());
</del><ins>+ RELEASE_ASSERT(!scope.exception());
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx"> #endif // ENABLE(SAMPLING_PROFILER)
</span><span class="lines">@@ -2101,6 +2115,16 @@
</span><span class="cx">
</span><span class="cx"> static void dumpException(GlobalObject* globalObject, JSValue exception)
</span><span class="cx"> {
</span><ins>+ VM& vm = globalObject->vm();
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
+#define CHECK_EXCEPTION() do { \
+ if (scope.exception()) { \
+ scope.clearException(); \
+ return; \
+ } \
+ } while (false)
+
</ins><span class="cx"> printf("Exception: %s\n", exception.toWTFString(globalObject->globalExec()).utf8().data());
</span><span class="cx">
</span><span class="cx"> Identifier nameID = Identifier::fromString(globalObject->globalExec(), "name");
</span><span class="lines">@@ -2109,9 +2133,13 @@
</span><span class="cx"> Identifier stackID = Identifier::fromString(globalObject->globalExec(), "stack");
</span><span class="cx">
</span><span class="cx"> JSValue nameValue = exception.get(globalObject->globalExec(), nameID);
</span><ins>+ CHECK_EXCEPTION();
</ins><span class="cx"> JSValue fileNameValue = exception.get(globalObject->globalExec(), fileNameID);
</span><ins>+ CHECK_EXCEPTION();
</ins><span class="cx"> JSValue lineNumberValue = exception.get(globalObject->globalExec(), lineNumberID);
</span><ins>+ CHECK_EXCEPTION();
</ins><span class="cx"> JSValue stackValue = exception.get(globalObject->globalExec(), stackID);
</span><ins>+ CHECK_EXCEPTION();
</ins><span class="cx">
</span><span class="cx"> if (nameValue.toWTFString(globalObject->globalExec()) == "SyntaxError"
</span><span class="cx"> && (!fileNameValue.isUndefinedOrNull() || !lineNumberValue.isUndefinedOrNull())) {
</span><span class="lines">@@ -2123,11 +2151,14 @@
</span><span class="cx">
</span><span class="cx"> if (!stackValue.isUndefinedOrNull())
</span><span class="cx"> printf("%s\n", stackValue.toWTFString(globalObject->globalExec()).utf8().data());
</span><ins>+
+#undef CHECK_EXCEPTION
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool checkUncaughtException(VM& vm, GlobalObject* globalObject, JSValue exception, const String& expectedExceptionName, bool alwaysDumpException)
</span><span class="cx"> {
</span><del>- vm.clearException();
</del><ins>+ auto scope = DECLARE_CATCH_SCOPE(vm);
+ scope.clearException();
</ins><span class="cx"> if (!exception) {
</span><span class="cx"> printf("Expected uncaught exception with name '%s' but none was thrown\n", expectedExceptionName.utf8().data());
</span><span class="cx"> return false;
</span><span class="lines">@@ -2135,13 +2166,13 @@
</span><span class="cx">
</span><span class="cx"> ExecState* exec = globalObject->globalExec();
</span><span class="cx"> JSValue exceptionClass = globalObject->get(exec, Identifier::fromString(exec, expectedExceptionName));
</span><del>- if (!exceptionClass.isObject() || vm.exception()) {
</del><ins>+ if (!exceptionClass.isObject() || scope.exception()) {
</ins><span class="cx"> printf("Expected uncaught exception with name '%s' but given exception class is not defined\n", expectedExceptionName.utf8().data());
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool isInstanceOfExpectedException = jsCast<JSObject*>(exceptionClass)->hasInstance(exec, exception);
</span><del>- if (vm.exception()) {
</del><ins>+ if (scope.exception()) {
</ins><span class="cx"> printf("Expected uncaught exception with name '%s' but given exception class fails performing hasInstance\n", expectedExceptionName.utf8().data());
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -2165,6 +2196,7 @@
</span><span class="cx"> JSC::Options::dumpGeneratedBytecodes() = true;
</span><span class="cx">
</span><span class="cx"> VM& vm = globalObject->vm();
</span><ins>+ auto scope = DECLARE_CATCH_SCOPE(vm);
</ins><span class="cx"> bool success = true;
</span><span class="cx">
</span><span class="cx"> auto checkException = [&] (bool isLastFile, bool hasException, JSValue value) {
</span><span class="lines">@@ -2207,7 +2239,7 @@
</span><span class="cx"> if (isModule) {
</span><span class="cx"> if (!promise)
</span><span class="cx"> promise = loadAndEvaluateModule(globalObject->globalExec(), jscSource(scriptBuffer, fileName));
</span><del>- vm.clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx">
</span><span class="cx"> JSFunction* fulfillHandler = JSNativeStdFunction::create(vm, globalObject, 1, String(), [&, isLastFile](ExecState* exec) {
</span><span class="cx"> checkException(isLastFile, false, exec->argument(0));
</span><span class="lines">@@ -2224,6 +2256,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> NakedPtr<Exception> evaluationException;
</span><span class="cx"> JSValue returnValue = evaluate(globalObject->globalExec(), jscSource(scriptBuffer, fileName), JSValue(), evaluationException);
</span><ins>+ ASSERT(!scope.exception());
</ins><span class="cx"> if (evaluationException)
</span><span class="cx"> returnValue = evaluationException->value();
</span><span class="cx"> checkException(isLastFile, evaluationException, returnValue);
</span><span class="lines">@@ -2230,7 +2263,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> scriptBuffer.clear();
</span><del>- vm.clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(REGEXP_TRACING)
</span><span class="lines">@@ -2243,6 +2276,9 @@
</span><span class="cx">
</span><span class="cx"> static void runInteractive(GlobalObject* globalObject)
</span><span class="cx"> {
</span><ins>+ VM& vm = globalObject->vm();
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
</ins><span class="cx"> String interpreterName(ASCIILiteral("Interpreter"));
</span><span class="cx">
</span><span class="cx"> bool shouldQuit = false;
</span><span class="lines">@@ -2293,7 +2329,7 @@
</span><span class="cx"> else
</span><span class="cx"> printf("%s\n", returnValue.toWTFString(globalObject->globalExec()).utf8().data());
</span><span class="cx">
</span><del>- globalObject->globalExec()->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> globalObject->vm().drainMicrotasks();
</span><span class="cx"> }
</span><span class="cx"> printf("\n");
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLLIntExceptionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LLIntExceptions.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LLIntExceptions.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/llint/LLIntExceptions.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -46,7 +46,8 @@
</span><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> #if LLINT_SLOW_PATH_TRACING
</span><span class="cx"> VM* vm = &exec->vm();
</span><del>- dataLog("Throwing exception ", vm->exception(), " (returnToThrow).\n");
</del><ins>+ auto scope = DECLARE_THROW_SCOPE(*vm);
+ dataLog("Throwing exception ", scope.exception(), " (returnToThrow).\n");
</ins><span class="cx"> #endif
</span><span class="cx"> return LLInt::exceptionInstructions();
</span><span class="cx"> }
</span><span class="lines">@@ -56,7 +57,8 @@
</span><span class="cx"> UNUSED_PARAM(exec);
</span><span class="cx"> #if LLINT_SLOW_PATH_TRACING
</span><span class="cx"> VM* vm = &exec->vm();
</span><del>- dataLog("Throwing exception ", vm->exception(), " (callToThrow).\n");
</del><ins>+ auto scope = DECLARE_THROW_SCOPE(*vm);
+ dataLog("Throwing exception ", scope.exception(), " (callToThrow).\n");
</ins><span class="cx"> #endif
</span><span class="cx"> return LLInt::getCodePtr(llint_throw_during_call_trampoline);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLLIntSlowPathscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -882,7 +882,7 @@
</span><span class="cx">
</span><span class="cx"> // Don't put to an object if toString threw an exception.
</span><span class="cx"> auto property = subscript.toPropertyKey(exec);
</span><del>- if (exec->vm().exception())
</del><ins>+ if (throwScope.exception())
</ins><span class="cx"> LLINT_END();
</span><span class="cx">
</span><span class="cx"> if (Optional<uint32_t> index = parseIndex(property))
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreprofilerProfilerBytecodeSequencecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/profiler/ProfilerBytecodeSequence.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/profiler/ProfilerBytecodeSequence.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/profiler/ProfilerBytecodeSequence.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -79,8 +79,9 @@
</span><span class="cx"> void BytecodeSequence::addSequenceProperties(ExecState* exec, JSObject* result) const
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSArray* header = constructEmptyArray(exec, 0);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> for (unsigned i = 0; i < m_header.size(); ++i)
</span><span class="cx"> header->putDirectIndex(exec, i, jsString(exec, String::fromUTF8(m_header[i])));
</span><span class="lines">@@ -87,7 +88,7 @@
</span><span class="cx"> result->putDirect(vm, exec->propertyNames().header, header);
</span><span class="cx">
</span><span class="cx"> JSArray* sequence = constructEmptyArray(exec, 0);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> for (unsigned i = 0; i < m_sequence.size(); ++i)
</span><span class="cx"> sequence->putDirectIndex(exec, i, m_sequence[i].toJS(exec));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreprofilerProfilerCompilationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/profiler/ProfilerCompilation.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/profiler/ProfilerCompilation.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/profiler/ProfilerCompilation.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -115,14 +115,15 @@
</span><span class="cx"> JSValue Compilation::toJS(ExecState* exec) const
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSObject* result = constructEmptyObject(exec);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> result->putDirect(vm, exec->propertyNames().bytecodesID, jsNumber(m_bytecodes->id()));
</span><span class="cx"> result->putDirect(vm, exec->propertyNames().compilationKind, jsString(exec, String::fromUTF8(toCString(m_kind))));
</span><span class="cx">
</span><span class="cx"> JSArray* profiledBytecodes = constructEmptyArray(exec, 0);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> for (unsigned i = 0; i < m_profiledBytecodes.size(); ++i)
</span><span class="cx"> profiledBytecodes->putDirectIndex(exec, i, m_profiledBytecodes[i].toJS(exec));
</span><span class="lines">@@ -129,7 +130,7 @@
</span><span class="cx"> result->putDirect(vm, exec->propertyNames().profiledBytecodes, profiledBytecodes);
</span><span class="cx">
</span><span class="cx"> JSArray* descriptions = constructEmptyArray(exec, 0);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> for (unsigned i = 0; i < m_descriptions.size(); ++i)
</span><span class="cx"> descriptions->putDirectIndex(exec, i, m_descriptions[i].toJS(exec));
</span><span class="lines">@@ -136,7 +137,7 @@
</span><span class="cx"> result->putDirect(vm, exec->propertyNames().descriptions, descriptions);
</span><span class="cx">
</span><span class="cx"> JSArray* counters = constructEmptyArray(exec, 0);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> for (auto it = m_counters.begin(), end = m_counters.end(); it != end; ++it) {
</span><span class="cx"> JSObject* counterEntry = constructEmptyObject(exec);
</span><span class="lines">@@ -147,7 +148,7 @@
</span><span class="cx"> result->putDirect(vm, exec->propertyNames().counters, counters);
</span><span class="cx">
</span><span class="cx"> JSArray* exitSites = constructEmptyArray(exec, 0);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> for (unsigned i = 0; i < m_osrExitSites.size(); ++i)
</span><span class="cx"> exitSites->putDirectIndex(exec, i, m_osrExitSites[i].toJS(exec));
</span><span class="lines">@@ -154,7 +155,7 @@
</span><span class="cx"> result->putDirect(vm, exec->propertyNames().osrExitSites, exitSites);
</span><span class="cx">
</span><span class="cx"> JSArray* exits = constructEmptyArray(exec, 0);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> for (unsigned i = 0; i < m_osrExits.size(); ++i)
</span><span class="cx"> exits->putDirectIndex(exec, i, m_osrExits[i].toJS(exec));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreprofilerProfilerDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/profiler/ProfilerDatabase.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/profiler/ProfilerDatabase.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/profiler/ProfilerDatabase.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -100,10 +100,11 @@
</span><span class="cx"> JSValue Database::toJS(ExecState* exec) const
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSObject* result = constructEmptyObject(exec);
</span><span class="cx">
</span><span class="cx"> JSArray* bytecodes = constructEmptyArray(exec, 0);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> for (unsigned i = 0; i < m_bytecodes.size(); ++i)
</span><span class="cx"> bytecodes->putDirectIndex(exec, i, m_bytecodes[i].toJS(exec));
</span><span class="lines">@@ -110,7 +111,7 @@
</span><span class="cx"> result->putDirect(vm, exec->propertyNames().bytecodes, bytecodes);
</span><span class="cx">
</span><span class="cx"> JSArray* compilations = constructEmptyArray(exec, 0);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> for (unsigned i = 0; i < m_compilations.size(); ++i)
</span><span class="cx"> compilations->putDirectIndex(exec, i, m_compilations[i]->toJS(exec));
</span><span class="lines">@@ -117,7 +118,7 @@
</span><span class="cx"> result->putDirect(vm, exec->propertyNames().compilations, compilations);
</span><span class="cx">
</span><span class="cx"> JSArray* events = constructEmptyArray(exec, 0);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> for (unsigned i = 0; i < m_events.size(); ++i)
</span><span class="cx"> events->putDirectIndex(exec, i, m_events[i].toJS(exec));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreprofilerProfilerOSRExitSitecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/profiler/ProfilerOSRExitSite.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/profiler/ProfilerOSRExitSite.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/profiler/ProfilerOSRExitSite.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -37,8 +37,9 @@
</span><span class="cx"> JSValue OSRExitSite::toJS(ExecState* exec) const
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSArray* result = constructEmptyArray(exec, 0);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> for (unsigned i = 0; i < m_codeAddresses.size(); ++i)
</span><span class="cx"> result->putDirectIndex(exec, i, jsString(exec, toString(RawPointer(m_codeAddresses[i]))));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreprofilerProfilerOriginStackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/profiler/ProfilerOriginStack.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/profiler/ProfilerOriginStack.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/profiler/ProfilerOriginStack.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -101,8 +101,9 @@
</span><span class="cx"> JSValue OriginStack::toJS(ExecState* exec) const
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSArray* result = constructEmptyArray(exec, 0);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < m_stack.size(); ++i)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeArrayPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -196,6 +196,9 @@
</span><span class="cx">
</span><span class="cx"> static ALWAYS_INLINE std::pair<SpeciesConstructResult, JSObject*> speciesConstructArray(ExecState* exec, JSObject* thisObject, unsigned length)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> // ECMA 9.4.2.3: https://tc39.github.io/ecma262/#sec-arrayspeciescreate
</span><span class="cx"> JSValue constructor = jsUndefined();
</span><span class="cx"> if (LIKELY(isArray(exec, thisObject))) {
</span><span class="lines">@@ -205,7 +208,7 @@
</span><span class="cx"> return std::make_pair(SpeciesConstructResult::FastPath, nullptr);
</span><span class="cx">
</span><span class="cx"> constructor = thisObject->get(exec, exec->propertyNames().constructor);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return std::make_pair(SpeciesConstructResult::Exception, nullptr);
</span><span class="cx"> if (constructor.isConstructor()) {
</span><span class="cx"> JSObject* constructorObject = jsCast<JSObject*>(constructor);
</span><span class="lines">@@ -214,12 +217,12 @@
</span><span class="cx"> }
</span><span class="cx"> if (constructor.isObject()) {
</span><span class="cx"> constructor = constructor.get(exec, exec->propertyNames().speciesSymbol);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return std::make_pair(SpeciesConstructResult::Exception, nullptr);
</span><span class="cx"> if (constructor.isNull())
</span><span class="cx"> return std::make_pair(SpeciesConstructResult::FastPath, nullptr);;
</span><span class="cx"> }
</span><del>- } else if (exec->hadException())
</del><ins>+ } else if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return std::make_pair(SpeciesConstructResult::Exception, nullptr);
</span><span class="cx">
</span><span class="cx"> if (constructor.isUndefined())
</span><span class="lines">@@ -228,7 +231,7 @@
</span><span class="cx"> MarkedArgumentBuffer args;
</span><span class="cx"> args.append(jsNumber(length));
</span><span class="cx"> JSObject* newObject = construct(exec, constructor, args, "Species construction did not get a valid constructor");
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return std::make_pair(SpeciesConstructResult::Exception, nullptr);
</span><span class="cx"> return std::make_pair(SpeciesConstructResult::CreatedObject, newObject);
</span><span class="cx"> }
</span><span class="lines">@@ -284,10 +287,10 @@
</span><span class="cx"> unsigned from = k + currentCount;
</span><span class="cx"> unsigned to = k + resultCount;
</span><span class="cx"> if (JSValue value = getProperty(exec, thisObj, from)) {
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> thisObj->putByIndexInline(exec, to, value, true);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> } else if (!thisObj->methodTable(vm)->deletePropertyByIndex(thisObj, exec, to)) {
</span><span class="cx"> throwTypeError(exec, scope, ASCIILiteral("Unable to delete property."));
</span><span class="lines">@@ -330,7 +333,7 @@
</span><span class="cx"> unsigned from = k + currentCount - 1;
</span><span class="cx"> unsigned to = k + resultCount - 1;
</span><span class="cx"> if (JSValue value = getProperty(exec, thisObj, from)) {
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> thisObj->putByIndexInline(exec, to, value, true);
</span><span class="cx"> } else if (!thisObj->methodTable(vm)->deletePropertyByIndex(thisObj, exec, to)) {
</span><span class="lines">@@ -337,7 +340,7 @@
</span><span class="cx"> throwTypeError(exec, scope, ASCIILiteral("Unable to delete property."));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -344,17 +347,18 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL arrayProtoFuncToString(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSValue thisValue = exec->thisValue().toThis(exec, StrictMode);
</span><span class="cx">
</span><span class="cx"> // 1. Let array be the result of calling ToObject on the this value.
</span><span class="cx"> JSObject* thisObject = thisValue.toObject(exec);
</span><del>- VM& vm = exec->vm();
- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> // 2. Let func be the result of calling the [[Get]] internal method of array with argument "join".
</span><span class="cx"> JSValue function = JSValue(thisObject).get(exec, exec->propertyNames().join);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> // 3. If IsCallable(func) is false, then let func be the standard built-in method Object.prototype.toString (15.2.4.2).
</span><span class="lines">@@ -383,7 +387,7 @@
</span><span class="cx"> return JSValue::encode(earlyReturnValue);
</span><span class="cx">
</span><span class="cx"> JSStringJoiner joiner(*exec, ',', length);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < length; ++i) {
</span><span class="lines">@@ -390,11 +394,11 @@
</span><span class="cx"> JSValue element = thisArray->tryGetIndexQuickly(i);
</span><span class="cx"> if (!element) {
</span><span class="cx"> element = thisArray->get(exec, i);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx"> joiner.append(*exec, element);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -403,14 +407,16 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL arrayProtoFuncToLocaleString(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSValue thisValue = exec->thisValue().toThis(exec, StrictMode);
</span><span class="cx">
</span><span class="cx"> JSObject* thisObject = thisValue.toObject(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> unsigned length = getLength(exec, thisObject);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> StringRecursionChecker checker(exec, thisObject);
</span><span class="lines">@@ -418,7 +424,7 @@
</span><span class="cx"> return JSValue::encode(earlyReturnValue);
</span><span class="cx">
</span><span class="cx"> JSStringJoiner stringJoiner(*exec, ',', length);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INTL)
</span><span class="lines">@@ -425,45 +431,45 @@
</span><span class="cx"> ArgList arguments(exec);
</span><span class="cx"> for (unsigned i = 0; i < length; ++i) {
</span><span class="cx"> JSValue element = thisObject->getIndex(exec, i);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> if (element.isUndefinedOrNull())
</span><span class="cx"> element = jsEmptyString(exec);
</span><span class="cx"> else {
</span><span class="cx"> JSValue conversionFunction = element.get(exec, exec->propertyNames().toLocaleString);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> CallData callData;
</span><span class="cx"> CallType callType = getCallData(conversionFunction, callData);
</span><span class="cx"> if (callType != CallType::None) {
</span><span class="cx"> element = call(exec, conversionFunction, callType, callData, element, arguments);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> stringJoiner.append(*exec, element);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx"> #else // !ENABLE(INTL)
</span><span class="cx"> for (unsigned i = 0; i < length; ++i) {
</span><span class="cx"> JSValue element = thisObject->getIndex(exec, i);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> if (element.isUndefinedOrNull())
</span><span class="cx"> continue;
</span><span class="cx"> JSValue conversionFunction = element.get(exec, exec->propertyNames().toLocaleString);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> CallData callData;
</span><span class="cx"> CallType callType = getCallData(conversionFunction, callData);
</span><span class="cx"> if (callType != CallType::None) {
</span><span class="cx"> element = call(exec, conversionFunction, callType, callData, element, exec->emptyList());
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx"> stringJoiner.append(*exec, element);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx"> #endif // !ENABLE(INTL)
</span><span class="lines">@@ -498,15 +504,16 @@
</span><span class="cx">
</span><span class="cx"> static JSValue slowJoin(ExecState& exec, JSObject* thisObject, JSString* separator, uint64_t length)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> // 5. If len is zero, return the empty String.
</span><span class="cx"> if (!length)
</span><span class="cx"> return jsEmptyString(&exec);
</span><span class="cx">
</span><del>- VM& vm = exec.vm();
-
</del><span class="cx"> // 6. Let element0 be Get(O, "0").
</span><span class="cx"> JSValue element0 = thisObject->getIndex(&exec, 0);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue();
</span><span class="cx">
</span><span class="cx"> // 7. If element0 is undefined or null, let R be the empty String; otherwise, let R be ? ToString(element0).
</span><span class="lines">@@ -515,7 +522,7 @@
</span><span class="cx"> r = jsEmptyString(&exec);
</span><span class="cx"> else
</span><span class="cx"> r = element0.toString(&exec);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue();
</span><span class="cx">
</span><span class="cx"> // 8. Let k be 1.
</span><span class="lines">@@ -524,7 +531,7 @@
</span><span class="cx"> for (uint64_t k = 1; k < length; ++k) {
</span><span class="cx"> // b. Let element be ? Get(O, ! ToString(k)).
</span><span class="cx"> JSValue element = thisObject->get(&exec, Identifier::fromString(&exec, AtomicString::number(k)));
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue();
</span><span class="cx">
</span><span class="cx"> // c. If element is undefined or null, let next be the empty String; otherwise, let next be ? ToString(element).
</span><span class="lines">@@ -535,7 +542,7 @@
</span><span class="cx"> next = jsEmptyString(&exec);
</span><span class="cx"> } else
</span><span class="cx"> next = element.toString(&exec);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue();
</span><span class="cx">
</span><span class="cx"> // a. Let S be the String value produced by concatenating R and sep.
</span><span class="lines">@@ -561,6 +568,9 @@
</span><span class="cx">
</span><span class="cx"> static inline JSValue fastJoin(ExecState& state, JSObject* thisObject, StringView separator, unsigned length)
</span><span class="cx"> {
</span><ins>+ VM& vm = state.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> switch (thisObject->indexingType()) {
</span><span class="cx"> case ALL_CONTIGUOUS_INDEXING_TYPES:
</span><span class="cx"> case ALL_INT32_INDEXING_TYPES: {
</span><span class="lines">@@ -568,7 +578,7 @@
</span><span class="cx"> if (length > butterfly.publicLength())
</span><span class="cx"> break;
</span><span class="cx"> JSStringJoiner joiner(state, separator, length);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> auto data = butterfly.contiguous().data();
</span><span class="cx"> bool holesKnownToBeOK = false;
</span><span class="lines">@@ -592,7 +602,7 @@
</span><span class="cx"> if (length > butterfly.publicLength())
</span><span class="cx"> break;
</span><span class="cx"> JSStringJoiner joiner(state, separator, length);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> auto data = butterfly.contiguousDouble().data();
</span><span class="cx"> bool holesKnownToBeOK = false;
</span><span class="lines">@@ -602,7 +612,7 @@
</span><span class="cx"> joiner.append(state, jsDoubleNumber(value));
</span><span class="cx"> else {
</span><span class="cx"> if (!holesKnownToBeOK) {
</span><del>- if (thisObject->structure(state.vm())->holesMustForwardToPrototype(state.vm()))
</del><ins>+ if (thisObject->structure(vm)->holesMustForwardToPrototype(vm))
</ins><span class="cx"> goto generalCase;
</span><span class="cx"> holesKnownToBeOK = true;
</span><span class="cx"> }
</span><span class="lines">@@ -615,14 +625,14 @@
</span><span class="cx">
</span><span class="cx"> generalCase:
</span><span class="cx"> JSStringJoiner joiner(state, separator, length);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> for (unsigned i = 0; i < length; ++i) {
</span><span class="cx"> JSValue element = thisObject->getIndex(&state, i);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> joiner.append(state, element);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="cx"> return joiner.join(state);
</span><span class="lines">@@ -630,6 +640,9 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL arrayProtoFuncJoin(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> // 1. Let O be ? ToObject(this value).
</span><span class="cx"> JSObject* thisObject = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
</span><span class="cx"> if (!thisObject)
</span><span class="lines">@@ -641,7 +654,7 @@
</span><span class="cx">
</span><span class="cx"> // 2. Let len be ? ToLength(? Get(O, "length")).
</span><span class="cx"> double length = toLength(exec, thisObject);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx">
</span><span class="cx"> // 3. If separator is undefined, let separator be the single-element String ",".
</span><span class="lines">@@ -653,7 +666,7 @@
</span><span class="cx"> uint64_t length64 = static_cast<uint64_t>(length);
</span><span class="cx"> ASSERT(static_cast<double>(length64) == length);
</span><span class="cx"> JSString* jsSeparator = jsSingleCharacterString(exec, comma);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx">
</span><span class="cx"> return JSValue::encode(slowJoin(*exec, thisObject, jsSeparator, length64));
</span><span class="lines">@@ -666,7 +679,7 @@
</span><span class="cx">
</span><span class="cx"> // 4. Let sep be ? ToString(separator).
</span><span class="cx"> JSString* jsSeparator = separatorValue.toString(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> if (UNLIKELY(length > std::numeric_limits<unsigned>::max() || !canUseFastJoin(thisObject))) {
</span><span class="lines">@@ -692,7 +705,7 @@
</span><span class="cx"> if (!thisObj)
</span><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> unsigned length = getLength(exec, thisObj);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> JSValue result;
</span><span class="lines">@@ -701,7 +714,7 @@
</span><span class="cx"> result = jsUndefined();
</span><span class="cx"> } else {
</span><span class="cx"> result = thisObj->get(exec, length - 1);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> if (!thisObj->methodTable(vm)->deletePropertyByIndex(thisObj, exec, length - 1)) {
</span><span class="cx"> throwTypeError(exec, scope, ASCIILiteral("Unable to delete property."));
</span><span class="lines">@@ -714,6 +727,8 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL arrayProtoFuncPush(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSValue thisValue = exec->thisValue().toThis(exec, StrictMode);
</span><span class="cx">
</span><span class="cx"> if (isJSArray(thisValue) && exec->argumentCount() == 1) {
</span><span class="lines">@@ -726,7 +741,7 @@
</span><span class="cx"> if (!thisObj)
</span><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> unsigned length = getLength(exec, thisObj);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> for (unsigned n = 0; n < exec->argumentCount(); n++) {
</span><span class="lines">@@ -738,7 +753,7 @@
</span><span class="cx"> Identifier propertyName = Identifier::fromString(exec, JSValue(static_cast<int64_t>(length) + static_cast<int64_t>(n)).toWTFString(exec));
</span><span class="cx"> thisObj->methodTable()->put(thisObj, exec, propertyName, exec->uncheckedArgument(n), slot);
</span><span class="cx"> }
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -757,7 +772,7 @@
</span><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx">
</span><span class="cx"> unsigned length = getLength(exec, thisObject);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> switch (thisObject->indexingType()) {
</span><span class="lines">@@ -798,31 +813,31 @@
</span><span class="cx"> for (unsigned lower = 0; lower < middle; lower++) {
</span><span class="cx"> unsigned upper = length - lower - 1;
</span><span class="cx"> bool lowerExists = thisObject->hasProperty(exec, lower);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> JSValue lowerValue;
</span><span class="cx"> if (lowerExists) {
</span><span class="cx"> lowerValue = thisObject->get(exec, lower);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool upperExists = thisObject->hasProperty(exec, upper);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> JSValue upperValue;
</span><span class="cx"> if (upperExists) {
</span><span class="cx"> upperValue = thisObject->get(exec, upper);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (upperExists) {
</span><span class="cx"> thisObject->putByIndexInline(exec, lower, upperValue, true);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> } else if (!thisObject->methodTable(vm)->deletePropertyByIndex(thisObject, exec, lower)) {
</span><del>- if (!vm.exception())
</del><ins>+ if (!scope.exception())
</ins><span class="cx"> throwTypeError(exec, scope, ASCIILiteral("Unable to delete property."));
</span><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> }
</span><span class="lines">@@ -829,10 +844,10 @@
</span><span class="cx">
</span><span class="cx"> if (lowerExists) {
</span><span class="cx"> thisObject->putByIndexInline(exec, upper, lowerValue, true);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> } else if (!thisObject->methodTable(vm)->deletePropertyByIndex(thisObject, exec, upper)) {
</span><del>- if (!vm.exception())
</del><ins>+ if (!scope.exception())
</ins><span class="cx"> throwTypeError(exec, scope, ASCIILiteral("Unable to delete property."));
</span><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> }
</span><span class="lines">@@ -842,11 +857,13 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL arrayProtoFuncShift(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSObject* thisObj = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
</span><span class="cx"> if (!thisObj)
</span><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> unsigned length = getLength(exec, thisObj);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> JSValue result;
</span><span class="lines">@@ -856,7 +873,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> result = thisObj->getIndex(exec, 0);
</span><span class="cx"> shift<JSArray::ShiftCountForShift>(exec, thisObj, 0, 1, 0, length);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> putLength(exec, thisObj, jsNumber(length - 1));
</span><span class="cx"> }
</span><span class="lines">@@ -867,11 +884,12 @@
</span><span class="cx"> {
</span><span class="cx"> // http://developer.netscape.com/docs/manuals/js/client/jsref/array.htm#1193713 or 15.4.4.10
</span><span class="cx"> VM& vm = exec->vm();
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSObject* thisObj = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
</span><span class="cx"> if (!thisObj)
</span><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> unsigned length = getLength(exec, thisObj);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> unsigned begin = argumentClampedIndexFromStartOrEnd(exec, 0, length);
</span><span class="lines">@@ -892,7 +910,7 @@
</span><span class="cx"> result = speciesResult.second;
</span><span class="cx"> else {
</span><span class="cx"> result = constructEmptyArray(exec, nullptr, end - begin);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -899,7 +917,7 @@
</span><span class="cx"> unsigned n = 0;
</span><span class="cx"> for (unsigned k = begin; k < end; k++, n++) {
</span><span class="cx"> JSValue v = getProperty(exec, thisObj, k);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> if (v)
</span><span class="cx"> result->putDirectIndex(exec, n, v);
</span><span class="lines">@@ -919,7 +937,7 @@
</span><span class="cx"> if (!thisObj)
</span><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> unsigned length = getLength(exec, thisObj);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> if (!exec->argumentCount()) {
</span><span class="lines">@@ -932,7 +950,7 @@
</span><span class="cx"> result = speciesResult.second;
</span><span class="cx"> else {
</span><span class="cx"> result = constructEmptyArray(exec, nullptr);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -967,12 +985,12 @@
</span><span class="cx">
</span><span class="cx"> for (unsigned k = 0; k < deleteCount; ++k) {
</span><span class="cx"> JSValue v = getProperty(exec, thisObj, k + begin);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> if (UNLIKELY(!v))
</span><span class="cx"> continue;
</span><span class="cx"> result->putByIndexInline(exec, k, v, true);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="lines">@@ -982,7 +1000,7 @@
</span><span class="cx">
</span><span class="cx"> for (unsigned k = 0; k < deleteCount; ++k) {
</span><span class="cx"> JSValue v = getProperty(exec, thisObj, k + begin);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> if (UNLIKELY(!v))
</span><span class="cx"> continue;
</span><span class="lines">@@ -994,16 +1012,16 @@
</span><span class="cx"> unsigned additionalArgs = std::max<int>(exec->argumentCount() - 2, 0);
</span><span class="cx"> if (additionalArgs < deleteCount) {
</span><span class="cx"> shift<JSArray::ShiftCountForSplice>(exec, thisObj, begin, deleteCount, additionalArgs, length);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> } else if (additionalArgs > deleteCount) {
</span><span class="cx"> unshift<JSArray::ShiftCountForSplice>(exec, thisObj, begin, deleteCount, additionalArgs, length);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx"> for (unsigned k = 0; k < additionalArgs; ++k) {
</span><span class="cx"> thisObj->putByIndexInline(exec, k + begin, exec->uncheckedArgument(k + 2), true);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1013,6 +1031,8 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL arrayProtoFuncUnShift(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> // 15.4.4.13
</span><span class="cx">
</span><span class="cx"> JSObject* thisObj = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
</span><span class="lines">@@ -1019,18 +1039,18 @@
</span><span class="cx"> if (!thisObj)
</span><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> unsigned length = getLength(exec, thisObj);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> unsigned nrArgs = exec->argumentCount();
</span><span class="cx"> if (nrArgs) {
</span><span class="cx"> unshift<JSArray::ShiftCountForShift>(exec, thisObj, 0, 0, nrArgs, length);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx"> for (unsigned k = 0; k < nrArgs; ++k) {
</span><span class="cx"> thisObj->putByIndexInline(exec, k, exec->uncheckedArgument(k), true);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx"> JSValue result = jsNumber(length + nrArgs);
</span><span class="lines">@@ -1040,13 +1060,15 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL arrayProtoFuncIndexOf(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> // 15.4.4.14
</span><span class="cx"> JSObject* thisObj = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
</span><span class="cx"> if (!thisObj)
</span><span class="cx"> return JSValue::encode(JSValue());
</span><del>- VM& vm = exec->vm();
</del><span class="cx"> unsigned length = getLength(exec, thisObj);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> unsigned index = argumentClampedIndexFromStartOrEnd(exec, 1, length);
</span><span class="lines">@@ -1053,13 +1075,13 @@
</span><span class="cx"> JSValue searchElement = exec->argument(0);
</span><span class="cx"> for (; index < length; ++index) {
</span><span class="cx"> JSValue e = getProperty(exec, thisObj, index);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> if (!e)
</span><span class="cx"> continue;
</span><span class="cx"> if (JSValue::strictEqual(exec, searchElement, e))
</span><span class="cx"> return JSValue::encode(jsNumber(index));
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1068,6 +1090,9 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL arrayProtoFuncLastIndexOf(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> // 15.4.4.15
</span><span class="cx"> JSObject* thisObj = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
</span><span class="cx"> if (!thisObj)
</span><span class="lines">@@ -1089,18 +1114,17 @@
</span><span class="cx"> index = static_cast<unsigned>(fromDouble);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- VM& vm = exec->vm();
</del><span class="cx"> JSValue searchElement = exec->argument(0);
</span><span class="cx"> do {
</span><span class="cx"> RELEASE_ASSERT(index < length);
</span><span class="cx"> JSValue e = getProperty(exec, thisObj, index);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> if (!e)
</span><span class="cx"> continue;
</span><span class="cx"> if (JSValue::strictEqual(exec, searchElement, e))
</span><span class="cx"> return JSValue::encode(jsNumber(index));
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> } while (index--);
</span><span class="cx">
</span><span class="lines">@@ -1109,12 +1133,14 @@
</span><span class="cx">
</span><span class="cx"> static bool moveElements(ExecState* exec, VM& vm, JSArray* target, unsigned targetOffset, JSArray* source, unsigned sourceLength)
</span><span class="cx"> {
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> if (LIKELY(!hasAnyArrayStorage(source->indexingType()) && !source->structure()->holesMustForwardToPrototype(vm))) {
</span><span class="cx"> for (unsigned i = 0; i < sourceLength; ++i) {
</span><span class="cx"> JSValue value = source->tryGetIndexQuickly(i);
</span><span class="cx"> if (value) {
</span><span class="cx"> target->putDirectIndex(exec, targetOffset + i, value);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1121,11 +1147,11 @@
</span><span class="cx"> } else {
</span><span class="cx"> for (unsigned i = 0; i < sourceLength; ++i) {
</span><span class="cx"> JSValue value = getProperty(exec, source, i);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> if (value) {
</span><span class="cx"> target->putDirectIndex(exec, targetOffset + i, value);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1154,7 +1180,7 @@
</span><span class="cx">
</span><span class="cx"> if (!result->appendMemcpy(exec, vm, 0, first)) {
</span><span class="cx"> if (!moveElements(exec, vm, result, 0, first, firstArraySize)) {
</span><del>- ASSERT(vm.exception());
</del><ins>+ ASSERT(scope.exception());
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1199,12 +1225,12 @@
</span><span class="cx"> IndexingType type = firstArray->mergeIndexingTypeForCopying(secondType);
</span><span class="cx"> if (type == NonArray || !firstArray->canFastCopy(vm, secondArray) || firstArraySize + secondArraySize >= MIN_SPARSE_ARRAY_INDEX) {
</span><span class="cx"> JSArray* result = constructEmptyArray(exec, nullptr, firstArraySize + secondArraySize);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx">
</span><span class="cx"> if (!moveElements(exec, vm, result, 0, firstArray, firstArraySize)
</span><span class="cx"> || !moveElements(exec, vm, result, firstArraySize, secondArray, secondArraySize)) {
</span><del>- ASSERT(vm.exception());
</del><ins>+ ASSERT(scope.exception());
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeBooleanConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/BooleanConstructor.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/BooleanConstructor.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/BooleanConstructor.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -48,12 +48,14 @@
</span><span class="cx"> // ECMA 15.6.2
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL constructWithBooleanConstructor(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSValue boolean = jsBoolean(exec->argument(0).toBoolean(exec));
</span><span class="cx"> Structure* booleanStructure = InternalFunction::createSubclassStructure(exec, exec->newTarget(), asInternalFunction(exec->callee())->globalObject()->booleanObjectStructure());
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><del>- BooleanObject* obj = BooleanObject::create(exec->vm(), booleanStructure);
- obj->setInternalValue(exec->vm(), boolean);
</del><ins>+ BooleanObject* obj = BooleanObject::create(vm, booleanStructure);
+ obj->setInternalValue(vm, boolean);
</ins><span class="cx"> return JSValue::encode(obj);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCallDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/CallData.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/CallData.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/CallData.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
</del><ins>+ * Copyright (C) 2008, 2016 Apple Inc. All Rights Reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -42,10 +42,12 @@
</span><span class="cx">
</span><span class="cx"> JSValue call(ExecState* exec, JSValue functionObject, CallType callType, const CallData& callData, JSValue thisValue, const ArgList& args, NakedPtr<Exception>& returnedException)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_CATCH_SCOPE(vm);
</ins><span class="cx"> JSValue result = call(exec, functionObject, callType, callData, thisValue, args);
</span><del>- if (exec->hadException()) {
- returnedException = exec->exception();
- exec->clearException();
</del><ins>+ if (UNLIKELY(scope.exception())) {
+ returnedException = scope.exception();
+ scope.clearException();
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="cx"> RELEASE_ASSERT(result);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCatchScopecpp"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/runtime/CatchScope.cpp (0 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/CatchScope.cpp (rev 0)
+++ trunk/Source/JavaScriptCore/runtime/CatchScope.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "CatchScope.h"
+
+namespace JSC {
+
+#if ENABLE(EXCEPTION_SCOPE_VERIFICATION)
+
+CatchScope::CatchScope(VM& vm, ExceptionEventLocation location)
+ : ExceptionScope(vm, location)
+{
+ m_vm.verifyExceptionCheckNeedIsSatisfied(m_recursionDepth, m_location);
+}
+
+CatchScope::~CatchScope()
+{
+ RELEASE_ASSERT(m_vm.m_topExceptionScope);
+ m_vm.verifyExceptionCheckNeedIsSatisfied(m_recursionDepth, m_location);
+}
+
+#endif // ENABLE(EXCEPTION_SCOPE_VERIFICATION)
+
+} // namespace JSC
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCatchScopeh"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/runtime/CatchScope.h (0 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/CatchScope.h (rev 0)
+++ trunk/Source/JavaScriptCore/runtime/CatchScope.h 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -0,0 +1,74 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef CatchScope_h
+#define CatchScope_h
+
+#include "ExceptionScope.h"
+
+namespace JSC {
+
+#if ENABLE(EXCEPTION_SCOPE_VERIFICATION)
+
+// If a function can clear JS exceptions, it should declare a CatchScope at the
+// top of the function (as early as possible) using the DECLARE_CATCH_SCOPE macro.
+// Declaring a CatchScope in a function means that the function intends to clear
+// pending exceptions before returning to its caller.
+
+class CatchScope : public ExceptionScope {
+public:
+ JS_EXPORT_PRIVATE CatchScope(VM&, ExceptionEventLocation);
+ CatchScope(const CatchScope&) = delete;
+ CatchScope(CatchScope&&) = default;
+
+ JS_EXPORT_PRIVATE ~CatchScope();
+
+ void clearException() { m_vm.clearException(); }
+};
+
+#define DECLARE_CATCH_SCOPE(vm__) \
+ JSC::CatchScope((vm__), JSC::ExceptionEventLocation(__FUNCTION__, __FILE__, __LINE__))
+
+#else // not ENABLE(EXCEPTION_SCOPE_VERIFICATION)
+
+class CatchScope : public ExceptionScope {
+public:
+ ALWAYS_INLINE CatchScope(VM& vm)
+ : ExceptionScope(vm)
+ { }
+ CatchScope(const CatchScope&) = delete;
+ CatchScope(CatchScope&&) = default;
+
+ ALWAYS_INLINE void clearException() { m_vm.clearException(); }
+};
+
+#define DECLARE_CATCH_SCOPE(vm__) \
+ JSC::CatchScope((vm__))
+
+#endif // ENABLE(EXCEPTION_SCOPE_VERIFICATION)
+
+} // namespace JSC
+
+#endif // CatchScope_h
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCommonSlowPathscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -62,7 +62,9 @@
</span><span class="cx">
</span><span class="cx"> #define BEGIN_NO_SET_PC() \
</span><span class="cx"> VM& vm = exec->vm(); \
</span><del>- NativeCallFrameTracer tracer(&vm, exec)
</del><ins>+ NativeCallFrameTracer tracer(&vm, exec); \
+ auto throwScope = DECLARE_THROW_SCOPE(vm); \
+ UNUSED_PARAM(throwScope)
</ins><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> #define SET_PC_FOR_STUBS() do { \
</span><span class="lines">@@ -99,10 +101,10 @@
</span><span class="cx">
</span><span class="cx"> #define CHECK_EXCEPTION() do { \
</span><span class="cx"> doExceptionFuzzingIfEnabled(exec, "CommonSlowPaths", pc); \
</span><del>- if (UNLIKELY(vm.exception())) { \
- RETURN_TO_THROW(exec, pc); \
</del><ins>+ if (UNLIKELY(throwScope.exception())) { \
+ RETURN_TO_THROW(exec, pc); \
</ins><span class="cx"> END_IMPL(); \
</span><del>- } \
</del><ins>+ } \
</ins><span class="cx"> } while (false)
</span><span class="cx">
</span><span class="cx"> #define END() do { \
</span><span class="lines">@@ -144,7 +146,7 @@
</span><span class="cx"> #define CALL_CHECK_EXCEPTION(exec, pc) do { \
</span><span class="cx"> ExecState* cceExec = (exec); \
</span><span class="cx"> Instruction* ccePC = (pc); \
</span><del>- if (UNLIKELY(vm.exception())) \
</del><ins>+ if (UNLIKELY(throwScope.exception())) \
</ins><span class="cx"> CALL_END_IMPL(cceExec, LLInt::callToThrow(cceExec)); \
</span><span class="cx"> } while (false)
</span><span class="cx">
</span><span class="lines">@@ -427,7 +429,7 @@
</span><span class="cx"> JSValue left = OP_C(2).jsValue();
</span><span class="cx"> JSValue right = OP_C(3).jsValue();
</span><span class="cx"> double a = left.toNumber(exec);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> RETURN(JSValue());
</span><span class="cx"> double b = right.toNumber(exec);
</span><span class="cx"> JSValue result = jsNumber(a * b);
</span><span class="lines">@@ -442,7 +444,7 @@
</span><span class="cx"> JSValue left = OP_C(2).jsValue();
</span><span class="cx"> JSValue right = OP_C(3).jsValue();
</span><span class="cx"> double a = left.toNumber(exec);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> RETURN(JSValue());
</span><span class="cx"> double b = right.toNumber(exec);
</span><span class="cx"> JSValue result = jsNumber(a - b);
</span><span class="lines">@@ -457,10 +459,10 @@
</span><span class="cx"> JSValue left = OP_C(2).jsValue();
</span><span class="cx"> JSValue right = OP_C(3).jsValue();
</span><span class="cx"> double a = left.toNumber(exec);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> RETURN(JSValue());
</span><span class="cx"> double b = right.toNumber(exec);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> RETURN(JSValue());
</span><span class="cx"> JSValue result = jsNumber(a / b);
</span><span class="cx"> RETURN_WITH_PROFILING(result, {
</span><span class="lines">@@ -472,7 +474,7 @@
</span><span class="cx"> {
</span><span class="cx"> BEGIN();
</span><span class="cx"> double a = OP_C(2).jsValue().toNumber(exec);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> RETURN(JSValue());
</span><span class="cx"> double b = OP_C(3).jsValue().toNumber(exec);
</span><span class="cx"> RETURN(jsNumber(jsMod(a, b)));
</span><span class="lines">@@ -482,10 +484,10 @@
</span><span class="cx"> {
</span><span class="cx"> BEGIN();
</span><span class="cx"> double a = OP_C(2).jsValue().toNumber(exec);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> RETURN(JSValue());
</span><span class="cx"> double b = OP_C(3).jsValue().toNumber(exec);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> RETURN(JSValue());
</span><span class="cx"> RETURN(jsNumber(operationMathPow(a, b)));
</span><span class="cx"> }
</span><span class="lines">@@ -494,7 +496,7 @@
</span><span class="cx"> {
</span><span class="cx"> BEGIN();
</span><span class="cx"> int32_t a = OP_C(2).jsValue().toInt32(exec);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> RETURN(JSValue());
</span><span class="cx"> uint32_t b = OP_C(3).jsValue().toUInt32(exec);
</span><span class="cx"> RETURN(jsNumber(a << (b & 31)));
</span><span class="lines">@@ -504,7 +506,7 @@
</span><span class="cx"> {
</span><span class="cx"> BEGIN();
</span><span class="cx"> int32_t a = OP_C(2).jsValue().toInt32(exec);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> RETURN(JSValue());
</span><span class="cx"> uint32_t b = OP_C(3).jsValue().toUInt32(exec);
</span><span class="cx"> RETURN(jsNumber(a >> (b & 31)));
</span><span class="lines">@@ -514,7 +516,7 @@
</span><span class="cx"> {
</span><span class="cx"> BEGIN();
</span><span class="cx"> uint32_t a = OP_C(2).jsValue().toUInt32(exec);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> RETURN(JSValue());
</span><span class="cx"> uint32_t b = OP_C(3).jsValue().toUInt32(exec);
</span><span class="cx"> RETURN(jsNumber(static_cast<int32_t>(a >> (b & 31))));
</span><span class="lines">@@ -531,7 +533,7 @@
</span><span class="cx"> {
</span><span class="cx"> BEGIN();
</span><span class="cx"> int32_t a = OP_C(2).jsValue().toInt32(exec);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> RETURN(JSValue());
</span><span class="cx"> int32_t b = OP_C(3).jsValue().toInt32(exec);
</span><span class="cx"> RETURN(jsNumber(a & b));
</span><span class="lines">@@ -541,7 +543,7 @@
</span><span class="cx"> {
</span><span class="cx"> BEGIN();
</span><span class="cx"> int32_t a = OP_C(2).jsValue().toInt32(exec);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> RETURN(JSValue());
</span><span class="cx"> int32_t b = OP_C(3).jsValue().toInt32(exec);
</span><span class="cx"> RETURN(jsNumber(a | b));
</span><span class="lines">@@ -551,7 +553,7 @@
</span><span class="cx"> {
</span><span class="cx"> BEGIN();
</span><span class="cx"> int32_t a = OP_C(2).jsValue().toInt32(exec);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> RETURN(JSValue());
</span><span class="cx"> int32_t b = OP_C(3).jsValue().toInt32(exec);
</span><span class="cx"> RETURN(jsNumber(a ^ b));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCommonSlowPathsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.h (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.h 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.h 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> return baseObj->hasProperty(exec, i);
</span><span class="cx">
</span><span class="cx"> auto property = propName.toPropertyKey(exec);
</span><del>- if (vm.exception())
</del><ins>+ if (scope.exception())
</ins><span class="cx"> return false;
</span><span class="cx"> return baseObj->hasProperty(exec, property);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCommonSlowPathsExceptionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/CommonSlowPathsExceptions.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/CommonSlowPathsExceptions.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/CommonSlowPathsExceptions.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx">
</span><span class="cx"> throwException(exec, scope, error);
</span><span class="cx"> #if LLINT_SLOW_PATH_TRACING
</span><del>- dataLog("Throwing exception ", vm->exception(), ".\n");
</del><ins>+ dataLog("Throwing exception ", scope.exception(), ".\n");
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCompletioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Completion.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Completion.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/Completion.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -87,16 +87,19 @@
</span><span class="cx">
</span><span class="cx"> JSValue evaluate(ExecState* exec, const SourceCode& source, JSValue thisValue, NakedPtr<Exception>& returnedException)
</span><span class="cx"> {
</span><del>- JSLockHolder lock(exec);
- RELEASE_ASSERT(exec->vm().atomicStringTable() == wtfThreadData().atomicStringTable());
- RELEASE_ASSERT(!exec->vm().isCollectorBusy());
</del><ins>+ VM& vm = exec->vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+ RELEASE_ASSERT(vm.atomicStringTable() == wtfThreadData().atomicStringTable());
+ RELEASE_ASSERT(!vm.isCollectorBusy());
</ins><span class="cx">
</span><span class="cx"> CodeProfiling profile(source);
</span><span class="cx">
</span><span class="cx"> ProgramExecutable* program = ProgramExecutable::create(exec, source);
</span><ins>+ ASSERT(scope.exception() || program);
</ins><span class="cx"> if (!program) {
</span><del>- returnedException = exec->vm().exception();
- exec->vm().clearException();
</del><ins>+ returnedException = scope.exception();
+ scope.clearException();
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -105,9 +108,9 @@
</span><span class="cx"> JSObject* thisObj = jsCast<JSObject*>(thisValue.toThis(exec, NotStrictMode));
</span><span class="cx"> JSValue result = exec->interpreter()->execute(program, exec, thisObj);
</span><span class="cx">
</span><del>- if (exec->hadException()) {
- returnedException = exec->exception();
- exec->clearException();
</del><ins>+ if (scope.exception()) {
+ returnedException = scope.exception();
+ scope.clearException();
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -147,9 +150,11 @@
</span><span class="cx">
</span><span class="cx"> static JSInternalPromise* rejectPromise(ExecState* exec, JSGlobalObject* globalObject)
</span><span class="cx"> {
</span><del>- ASSERT(exec->hadException());
- JSValue exception = exec->exception()->value();
- exec->clearException();
</del><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+ ASSERT(scope.exception());
+ JSValue exception = scope.exception()->value();
+ scope.clearException();
</ins><span class="cx"> JSInternalPromiseDeferred* deferred = JSInternalPromiseDeferred::create(exec, globalObject);
</span><span class="cx"> deferred->reject(exec, exception);
</span><span class="cx"> return deferred->promise();
</span><span class="lines">@@ -176,17 +181,19 @@
</span><span class="cx">
</span><span class="cx"> JSInternalPromise* loadAndEvaluateModule(ExecState* exec, const SourceCode& source, JSValue initiator)
</span><span class="cx"> {
</span><del>- JSLockHolder lock(exec);
- RELEASE_ASSERT(exec->vm().atomicStringTable() == wtfThreadData().atomicStringTable());
- RELEASE_ASSERT(!exec->vm().isCollectorBusy());
</del><ins>+ VM& vm = exec->vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_THROW_SCOPE(vm);
+ RELEASE_ASSERT(vm.atomicStringTable() == wtfThreadData().atomicStringTable());
+ RELEASE_ASSERT(!vm.isCollectorBusy());
</ins><span class="cx">
</span><del>- Symbol* key = createSymbolForEntryPointModule(exec->vm());
</del><ins>+ Symbol* key = createSymbolForEntryPointModule(vm);
</ins><span class="cx">
</span><span class="cx"> JSGlobalObject* globalObject = exec->vmEntryGlobalObject();
</span><span class="cx">
</span><span class="cx"> // Insert the given source code to the ModuleLoader registry as the fetched registry entry.
</span><span class="cx"> globalObject->moduleLoader()->provide(exec, key, JSModuleLoader::Status::Fetch, source.view().toString());
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return rejectPromise(exec, globalObject);
</span><span class="cx">
</span><span class="cx"> return loadAndEvaluateModule(lock, exec, globalObject, key, jsUndefined(), initiator);
</span><span class="lines">@@ -213,11 +220,13 @@
</span><span class="cx">
</span><span class="cx"> JSInternalPromise* loadModule(ExecState* exec, const SourceCode& source, JSValue initiator)
</span><span class="cx"> {
</span><del>- JSLockHolder lock(exec);
- RELEASE_ASSERT(exec->vm().atomicStringTable() == wtfThreadData().atomicStringTable());
- RELEASE_ASSERT(!exec->vm().isCollectorBusy());
</del><ins>+ VM& vm = exec->vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_THROW_SCOPE(vm);
+ RELEASE_ASSERT(vm.atomicStringTable() == wtfThreadData().atomicStringTable());
+ RELEASE_ASSERT(!vm.isCollectorBusy());
</ins><span class="cx">
</span><del>- Symbol* key = createSymbolForEntryPointModule(exec->vm());
</del><ins>+ Symbol* key = createSymbolForEntryPointModule(vm);
</ins><span class="cx">
</span><span class="cx"> JSGlobalObject* globalObject = exec->vmEntryGlobalObject();
</span><span class="cx">
</span><span class="lines">@@ -224,7 +233,7 @@
</span><span class="cx"> // Insert the given source code to the ModuleLoader registry as the fetched registry entry.
</span><span class="cx"> // FIXME: Introduce JSSourceCode object to wrap around this source.
</span><span class="cx"> globalObject->moduleLoader()->provide(exec, key, JSModuleLoader::Status::Fetch, source.view().toString());
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return rejectPromise(exec, globalObject);
</span><span class="cx">
</span><span class="cx"> return loadModule(lock, exec, globalObject, key, jsUndefined(), initiator);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeConsoleObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ConsoleObject.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ConsoleObject.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/ConsoleObject.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -196,12 +196,14 @@
</span><span class="cx">
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL consoleProtoFuncAssert(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> ConsoleClient* client = exec->lexicalGlobalObject()->consoleClient();
</span><span class="cx"> if (!client)
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> bool condition = exec->argument(0).toBoolean(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> if (condition)
</span><span class="lines">@@ -225,6 +227,8 @@
</span><span class="cx">
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL consoleProtoFuncProfile(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> ConsoleClient* client = exec->lexicalGlobalObject()->consoleClient();
</span><span class="cx"> if (!client)
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -236,7 +240,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const String& title(valueToStringWithUndefinedOrNullCheck(exec, exec->argument(0)));
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> client->profile(exec, title);
</span><span class="lines">@@ -245,6 +249,8 @@
</span><span class="cx">
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL consoleProtoFuncProfileEnd(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> ConsoleClient* client = exec->lexicalGlobalObject()->consoleClient();
</span><span class="cx"> if (!client)
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -256,7 +262,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const String& title(valueToStringWithUndefinedOrNullCheck(exec, exec->argument(0)));
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> client->profileEnd(exec, title);
</span><span class="lines">@@ -265,6 +271,8 @@
</span><span class="cx">
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL consoleProtoFuncTakeHeapSnapshot(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> ConsoleClient* client = exec->lexicalGlobalObject()->consoleClient();
</span><span class="cx"> if (!client)
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -276,7 +284,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const String& title(valueToStringWithUndefinedOrNullCheck(exec, exec->argument(0)));
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> client->takeHeapSnapshot(exec, title);
</span><span class="lines">@@ -292,6 +300,8 @@
</span><span class="cx">
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL consoleProtoFuncTime(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> ConsoleClient* client = exec->lexicalGlobalObject()->consoleClient();
</span><span class="cx"> if (!client)
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -301,7 +311,7 @@
</span><span class="cx"> title = ASCIILiteral("default");
</span><span class="cx"> else {
</span><span class="cx"> title = valueOrDefaultLabelString(exec, exec->argument(0));
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -311,6 +321,8 @@
</span><span class="cx">
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL consoleProtoFuncTimeEnd(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> ConsoleClient* client = exec->lexicalGlobalObject()->consoleClient();
</span><span class="cx"> if (!client)
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -320,7 +332,7 @@
</span><span class="cx"> title = ASCIILiteral("default");
</span><span class="cx"> else {
</span><span class="cx"> title = valueOrDefaultLabelString(exec, exec->argument(0));
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeDateConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/DateConstructor.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/DateConstructor.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/DateConstructor.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -147,6 +147,7 @@
</span><span class="cx"> JSObject* constructDate(ExecState* exec, JSGlobalObject* globalObject, JSValue newTarget, const ArgList& args)
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> int numArgs = args.size();
</span><span class="cx">
</span><span class="cx"> double value;
</span><span class="lines">@@ -167,7 +168,7 @@
</span><span class="cx"> value = millisecondsFromComponents(exec, args, WTF::LocalTime);
</span><span class="cx">
</span><span class="cx"> Structure* dateStructure = InternalFunction::createSubclassStructure(exec, newTarget, globalObject->dateStructure());
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> return DateInstance::create(vm, dateStructure, value);
</span><span class="lines">@@ -202,10 +203,12 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL dateParse(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> String dateStr = exec->argument(0).toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><del>- return JSValue::encode(jsNumber(parseDate(exec->vm(), dateStr)));
</del><ins>+ return JSValue::encode(jsNumber(parseDate(vm, dateStr)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL dateNow(ExecState* exec)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeDatePrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/DatePrototype.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/DatePrototype.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/DatePrototype.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -603,7 +603,8 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL dateProtoFuncToPrimitiveSymbol(ExecState* exec)
</span><span class="cx"> {
</span><del>- auto scope = DECLARE_THROW_SCOPE(exec->vm());
</del><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSValue thisValue = exec->thisValue();
</span><span class="cx"> if (!thisValue.isObject())
</span><span class="cx"> return throwVMTypeError(exec, scope, "Date.prototype[Symbol.toPrimitive] expected |this| to be an object.");
</span><span class="lines">@@ -614,7 +615,7 @@
</span><span class="cx">
</span><span class="cx"> JSValue hintValue = exec->uncheckedArgument(0);
</span><span class="cx"> PreferredPrimitiveType type = toPreferredPrimitiveType(exec, hintValue);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx">
</span><span class="cx"> if (type == NoPreference)
</span><span class="lines">@@ -1123,20 +1124,21 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL dateProtoFuncToJSON(ExecState* exec)
</span><span class="cx"> {
</span><del>- auto scope = DECLARE_THROW_SCOPE(exec->vm());
</del><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSValue thisValue = exec->thisValue();
</span><span class="cx"> JSObject* object = jsCast<JSObject*>(thisValue.toThis(exec, NotStrictMode));
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsNull());
</span><span class="cx">
</span><span class="cx"> JSValue timeValue = object->toPrimitive(exec, PreferNumber);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsNull());
</span><span class="cx"> if (timeValue.isNumber() && !(timeValue.isInt32() || std::isfinite(timeValue.asDouble())))
</span><span class="cx"> return JSValue::encode(jsNull());
</span><span class="cx">
</span><del>- JSValue toISOValue = object->get(exec, exec->vm().propertyNames->toISOString);
- if (exec->hadException())
</del><ins>+ JSValue toISOValue = object->get(exec, vm.propertyNames->toISOString);
+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsNull());
</span><span class="cx">
</span><span class="cx"> CallData callData;
</span><span class="lines">@@ -1145,7 +1147,7 @@
</span><span class="cx"> return throwVMTypeError(exec, scope, ASCIILiteral("toISOString is not a function"));
</span><span class="cx">
</span><span class="cx"> JSValue result = call(exec, asObject(toISOValue), callType, callData, object, exec->emptyList());
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsNull());
</span><span class="cx"> if (result.isObject())
</span><span class="cx"> return throwVMTypeError(exec, scope, ASCIILiteral("toISOString did not return a primitive value"));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeErrorConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ErrorConstructor.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ErrorConstructor.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/ErrorConstructor.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -50,9 +50,11 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL Interpreter::constructWithErrorConstructor(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSValue message = exec->argumentCount() ? exec->argument(0) : jsUndefined();
</span><span class="cx"> Structure* errorStructure = InternalFunction::createSubclassStructure(exec, exec->newTarget(), asInternalFunction(exec->callee())->globalObject()->errorStructure());
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> return JSValue::encode(ErrorInstance::create(exec, errorStructure, message, nullptr, TypeNothing, false));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeErrorInstancecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ErrorInstance.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ErrorInstance.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/ErrorInstance.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -158,6 +158,7 @@
</span><span class="cx"> String ErrorInstance::sanitizedToString(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx">
</span><span class="cx"> JSValue nameValue;
</span><span class="cx"> auto namePropertName = vm.propertyNames->name;
</span><span class="lines">@@ -177,7 +178,7 @@
</span><span class="cx"> }
</span><span class="cx"> currentObj = obj->getPrototypeDirect();
</span><span class="cx"> }
</span><del>- ASSERT(!vm.exception());
</del><ins>+ ASSERT(!scope.exception());
</ins><span class="cx">
</span><span class="cx"> String nameString;
</span><span class="cx"> if (!nameValue)
</span><span class="lines">@@ -184,7 +185,7 @@
</span><span class="cx"> nameString = ASCIILiteral("Error");
</span><span class="cx"> else {
</span><span class="cx"> nameString = nameValue.toString(exec)->value(exec);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -193,7 +194,7 @@
</span><span class="cx"> PropertySlot messageSlot(this, PropertySlot::InternalMethodType::VMInquiry);
</span><span class="cx"> if (JSObject::getOwnPropertySlot(this, exec, messagePropertName, messageSlot) && messageSlot.isValue())
</span><span class="cx"> messageValue = messageSlot.getValue(exec, messagePropertName);
</span><del>- ASSERT(!vm.exception());
</del><ins>+ ASSERT(!scope.exception());
</ins><span class="cx">
</span><span class="cx"> String messageString;
</span><span class="cx"> if (!messageValue)
</span><span class="lines">@@ -200,7 +201,7 @@
</span><span class="cx"> messageString = String();
</span><span class="cx"> else {
</span><span class="cx"> messageString = messageValue.toString(exec)->value(exec);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeErrorPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ErrorPrototype.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ErrorPrototype.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/ErrorPrototype.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx">
</span><span class="cx"> // 3. Let name be the result of calling the [[Get]] internal method of O with argument "name".
</span><span class="cx"> JSValue name = thisObj->get(exec, exec->propertyNames().name);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> // 4. If name is undefined, then let name be "Error"; else let name be ToString(name).
</span><span class="lines">@@ -94,13 +94,13 @@
</span><span class="cx"> nameString = ASCIILiteral("Error");
</span><span class="cx"> else {
</span><span class="cx"> nameString = name.toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // 5. Let msg be the result of calling the [[Get]] internal method of O with argument "message".
</span><span class="cx"> JSValue message = thisObj->get(exec, exec->propertyNames().message);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> // (sic)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> messageString = String();
</span><span class="cx"> else {
</span><span class="cx"> messageString = message.toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeExceptionEventLocationcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/runtime/ExceptionEventLocation.cpp (0 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ExceptionEventLocation.cpp (rev 0)
+++ trunk/Source/JavaScriptCore/runtime/ExceptionEventLocation.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "ExceptionEventLocation.h"
+
+#include <wtf/PrintStream.h>
+
+namespace WTF {
+
+void printInternal(PrintStream& out, JSC::ExceptionEventLocation location)
+{
+ out.print(location.functionName, " @ ", location.file, ":", location.line);
+}
+
+} // namespace WTF
+
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeExceptionEventLocationhfromrev205568trunkSourceJavaScriptCoreruntimeThrowScopeLocationh"></a>
<div class="copfile"><h4>Copied: trunk/Source/JavaScriptCore/runtime/ExceptionEventLocation.h (from rev 205568, trunk/Source/JavaScriptCore/runtime/ThrowScopeLocation.h) (0 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ExceptionEventLocation.h (rev 0)
+++ trunk/Source/JavaScriptCore/runtime/ExceptionEventLocation.h 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -0,0 +1,51 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+namespace JSC {
+
+struct ExceptionEventLocation {
+ ExceptionEventLocation() { }
+ ExceptionEventLocation(const char* functionName, const char* file, unsigned line)
+ : functionName(functionName)
+ , file(file)
+ , line(line)
+ { }
+
+ const char* functionName { nullptr };
+ const char* file { nullptr };
+ unsigned line { 0 };
+};
+
+} // namespace JSC
+
+namespace WTF {
+
+class PrintStream;
+
+void printInternal(PrintStream&, JSC::ExceptionEventLocation);
+
+} // namespace WTF
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeExceptionHelpersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ExceptionHelpers.h (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ExceptionHelpers.h 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/ExceptionHelpers.h 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #ifndef ExceptionHelpers_h
</span><span class="cx"> #define ExceptionHelpers_h
</span><span class="cx">
</span><ins>+#include "CatchScope.h"
</ins><span class="cx"> #include "ErrorInstance.h"
</span><span class="cx"> #include "JSObject.h"
</span><span class="cx"> #include "ThrowScope.h"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeExceptionScopecpp"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/runtime/ExceptionScope.cpp (0 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ExceptionScope.cpp (rev 0)
+++ trunk/Source/JavaScriptCore/runtime/ExceptionScope.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -0,0 +1,52 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "ExceptionScope.h"
+
+#include "Exception.h"
+
+namespace JSC {
+
+#if ENABLE(EXCEPTION_SCOPE_VERIFICATION)
+
+ExceptionScope::ExceptionScope(VM& vm, ExceptionEventLocation location)
+ : m_vm(vm)
+ , m_previousScope(vm.m_topExceptionScope)
+ , m_location(location)
+ , m_recursionDepth(m_previousScope ? m_previousScope->m_recursionDepth + 1 : 0)
+{
+ m_vm.m_topExceptionScope = this;
+}
+
+ExceptionScope::~ExceptionScope()
+{
+ RELEASE_ASSERT(m_vm.m_topExceptionScope);
+ m_vm.m_topExceptionScope = m_previousScope;
+}
+
+#endif // ENABLE(EXCEPTION_SCOPE_VERIFICATION)
+
+} // namespace JSC
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeExceptionScopeh"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/runtime/ExceptionScope.h (0 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ExceptionScope.h (rev 0)
+++ trunk/Source/JavaScriptCore/runtime/ExceptionScope.h 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -0,0 +1,76 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef ExceptionScope_h
+#define ExceptionScope_h
+
+#include "VM.h"
+
+namespace JSC {
+
+class Exception;
+
+#if ENABLE(EXCEPTION_SCOPE_VERIFICATION)
+
+class ExceptionScope {
+public:
+ VM& vm() const { return m_vm; }
+ unsigned recursionDepth() const { return m_recursionDepth; }
+ Exception* exception() { return m_vm.exception(); }
+
+protected:
+ ExceptionScope(VM&, ExceptionEventLocation);
+ ExceptionScope(const ExceptionScope&) = delete;
+ ExceptionScope(ExceptionScope&&) = default;
+ ~ExceptionScope();
+
+ VM& m_vm;
+ ExceptionScope* m_previousScope;
+ ExceptionEventLocation m_location;
+ unsigned m_recursionDepth;
+};
+
+#else // not ENABLE(EXCEPTION_SCOPE_VERIFICATION)
+
+class ExceptionScope {
+public:
+ ALWAYS_INLINE VM& vm() const { return m_vm; }
+ ALWAYS_INLINE Exception* exception() { return m_vm.exception(); }
+
+protected:
+ ALWAYS_INLINE ExceptionScope(VM& vm)
+ : m_vm(vm)
+ { }
+ ExceptionScope(const ExceptionScope&) = delete;
+ ExceptionScope(ExceptionScope&&) = default;
+
+ VM& m_vm;
+};
+
+#endif // ENABLE(EXCEPTION_SCOPE_VERIFICATION)
+
+} // namespace JSC
+
+#endif // ExceptionScope_h
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeFunctionConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/FunctionConstructor.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/FunctionConstructor.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/FunctionConstructor.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Structure* subclassStructure = InternalFunction::createSubclassStructure(exec, newTarget, globalObject->functionStructure());
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> return JSFunction::create(vm, function, globalObject->globalScope(), subclassStructure);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeFunctionPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/FunctionPrototype.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/FunctionPrototype.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/FunctionPrototype.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> // Else set the length own property of F to 0.
</span><span class="cx"> unsigned length = 0;
</span><span class="cx"> if (targetObject->hasOwnProperty(exec, exec->propertyNames().length)) {
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> // a. Let L be the length property of Target minus the length of A.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeGenericArgumentsInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/GenericArgumentsInlines.h (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/GenericArgumentsInlines.h 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/GenericArgumentsInlines.h 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -219,6 +219,9 @@
</span><span class="cx"> template<typename Type>
</span><span class="cx"> void GenericArguments<Type>::copyToArguments(ExecState* exec, VirtualRegister firstElementDest, unsigned offset, unsigned length)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> Type* thisObject = static_cast<Type*>(this);
</span><span class="cx"> for (unsigned i = 0; i < length; ++i) {
</span><span class="cx"> if (thisObject->canAccessIndexQuickly(i + offset))
</span><span class="lines">@@ -225,7 +228,7 @@
</span><span class="cx"> exec->r(firstElementDest + i) = thisObject->getIndexQuickly(i + offset);
</span><span class="cx"> else {
</span><span class="cx"> exec->r(firstElementDest + i) = get(exec, i + offset);
</span><del>- if (UNLIKELY(exec->vm().exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeGetterSettercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/GetterSetter.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/GetterSetter.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/GetterSetter.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -73,15 +73,17 @@
</span><span class="cx">
</span><span class="cx"> JSValue callGetter(ExecState* exec, JSValue base, JSValue getterSetter)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> // FIXME: Some callers may invoke get() without checking for an exception first.
</span><span class="cx"> // We work around that by checking here.
</span><del>- if (exec->hadException())
- return exec->exception()->value();
</del><ins>+ if (UNLIKELY(scope.exception()))
+ return scope.exception()->value();
</ins><span class="cx">
</span><span class="cx"> JSObject* getter = jsCast<GetterSetter*>(getterSetter)->getter();
</span><span class="cx">
</span><span class="cx"> CallData callData;
</span><del>- CallType callType = getter->methodTable(exec->vm())->getCallData(getter, callData);
</del><ins>+ CallType callType = getter->methodTable(vm)->getCallData(getter, callData);
</ins><span class="cx"> return call(exec, getter, callType, callData, base, ArgList());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeInspectorInstrumentationObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/InspectorInstrumentationObject.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/InspectorInstrumentationObject.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/InspectorInstrumentationObject.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -83,9 +83,11 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL inspectorInstrumentationObjectLog(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSValue target = exec->argument(0);
</span><span class="cx"> String value = target.toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> dataLog(value, "\n");
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeInternalFunctioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/InternalFunction.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/InternalFunction.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/InternalFunction.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -97,6 +97,7 @@
</span><span class="cx"> {
</span><span class="cx">
</span><span class="cx"> VM& vm = exec->vm();
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> // We allow newTarget == JSValue() because the API needs to be able to create classes without having a real JS frame.
</span><span class="cx"> // Since we don't allow subclassing in the API we just treat newTarget == JSValue() as newTarget == exec->callee()
</span><span class="cx"> ASSERT(!newTarget || newTarget.isConstructor());
</span><span class="lines">@@ -112,13 +113,13 @@
</span><span class="cx">
</span><span class="cx"> // Note, Reflect.construct might cause the profile to churn but we don't care.
</span><span class="cx"> JSValue prototypeValue = newTarget.get(exec, exec->propertyNames().prototype);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> if (JSObject* prototype = jsDynamicCast<JSObject*>(prototypeValue))
</span><span class="cx"> return targetFunction->rareData(vm)->createInternalFunctionAllocationStructureFromBase(vm, prototype, baseClass);
</span><span class="cx"> } else {
</span><span class="cx"> JSValue prototypeValue = newTarget.get(exec, exec->propertyNames().prototype);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> if (JSObject* prototype = jsDynamicCast<JSObject*>(prototypeValue)) {
</span><span class="cx"> // This only happens if someone Reflect.constructs our builtin constructor with another builtin constructor as the new.target.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIntlCollatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/IntlCollator.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/IntlCollator.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/IntlCollator.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -162,6 +162,9 @@
</span><span class="cx">
</span><span class="cx"> void IntlCollator::initializeCollator(ExecState& state, JSValue locales, JSValue optionsValue)
</span><span class="cx"> {
</span><ins>+ VM& vm = state.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> // 10.1.1 InitializeCollator (collator, locales, options) (ECMA-402 2.0)
</span><span class="cx"> // 1. If collator has an [[initializedIntlObject]] internal slot with value true, throw a TypeError exception.
</span><span class="cx"> // 2. Set collator.[[initializedIntlObject]] to true.
</span><span class="lines">@@ -169,7 +172,7 @@
</span><span class="cx"> // 3. Let requestedLocales be CanonicalizeLocaleList(locales).
</span><span class="cx"> auto requestedLocales = canonicalizeLocaleList(state, locales);
</span><span class="cx"> // 4. ReturnIfAbrupt(requestedLocales).
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // 5. If options is undefined, then
</span><span class="lines">@@ -181,14 +184,14 @@
</span><span class="cx"> // a. Let options be ToObject(options).
</span><span class="cx"> options = optionsValue.toObject(&state);
</span><span class="cx"> // b. ReturnIfAbrupt(options).
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // 7. Let u be GetOption(options, "usage", "string", «"sort", "search"», "sort").
</span><del>- String usageString = intlStringOption(state, options, state.vm().propertyNames->usage, { "sort", "search" }, "usage must be either \"sort\" or \"search\"", "sort");
</del><ins>+ String usageString = intlStringOption(state, options, vm.propertyNames->usage, { "sort", "search" }, "usage must be either \"sort\" or \"search\"", "sort");
</ins><span class="cx"> // 8. ReturnIfAbrupt(u).
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> // 9. Set collator.[[usage]] to u.
</span><span class="cx"> if (usageString == "sort")
</span><span class="lines">@@ -212,9 +215,9 @@
</span><span class="cx"> HashMap<String, String> opt;
</span><span class="cx">
</span><span class="cx"> // 13. Let matcher be GetOption(options, "localeMatcher", "string", «"lookup", "best fit"», "best fit").
</span><del>- String matcher = intlStringOption(state, options, state.vm().propertyNames->localeMatcher, { "lookup", "best fit" }, "localeMatcher must be either \"lookup\" or \"best fit\"", "best fit");
</del><ins>+ String matcher = intlStringOption(state, options, vm.propertyNames->localeMatcher, { "lookup", "best fit" }, "localeMatcher must be either \"lookup\" or \"best fit\"", "best fit");
</ins><span class="cx"> // 14. ReturnIfAbrupt(matcher).
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> // 15. Set opt.[[localeMatcher]] to matcher.
</span><span class="cx"> opt.add(ASCIILiteral("localeMatcher"), matcher);
</span><span class="lines">@@ -233,8 +236,8 @@
</span><span class="cx"> {
</span><span class="cx"> String numericString;
</span><span class="cx"> bool usesFallback;
</span><del>- bool numeric = intlBooleanOption(state, options, state.vm().propertyNames->numeric, usesFallback);
- if (state.hadException())
</del><ins>+ bool numeric = intlBooleanOption(state, options, vm.propertyNames->numeric, usesFallback);
+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> if (!usesFallback)
</span><span class="cx"> numericString = ASCIILiteral(numeric ? "true" : "false");
</span><span class="lines">@@ -241,8 +244,8 @@
</span><span class="cx"> opt.add(ASCIILiteral("kn"), numericString);
</span><span class="cx"> }
</span><span class="cx"> {
</span><del>- String caseFirst = intlStringOption(state, options, state.vm().propertyNames->caseFirst, { "upper", "lower", "false" }, "caseFirst must be either \"upper\", \"lower\", or \"false\"", nullptr);
- if (state.hadException())
</del><ins>+ String caseFirst = intlStringOption(state, options, vm.propertyNames->caseFirst, { "upper", "lower", "false" }, "caseFirst must be either \"upper\", \"lower\", or \"false\"", nullptr);
+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> opt.add(ASCIILiteral("kf"), caseFirst);
</span><span class="cx"> }
</span><span class="lines">@@ -277,9 +280,9 @@
</span><span class="cx"> m_numeric = (result.get(ASCIILiteral("kn")) == "true");
</span><span class="cx">
</span><span class="cx"> // 24. Let s be GetOption(options, "sensitivity", "string", «"base", "accent", "case", "variant"», undefined).
</span><del>- String sensitivityString = intlStringOption(state, options, state.vm().propertyNames->sensitivity, { "base", "accent", "case", "variant" }, "sensitivity must be either \"base\", \"accent\", \"case\", or \"variant\"", nullptr);
</del><ins>+ String sensitivityString = intlStringOption(state, options, vm.propertyNames->sensitivity, { "base", "accent", "case", "variant" }, "sensitivity must be either \"base\", \"accent\", \"case\", or \"variant\"", nullptr);
</ins><span class="cx"> // 25. ReturnIfAbrupt(s).
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> // 26. If s is undefined, then
</span><span class="cx"> // a. If u is "sort", then let s be "variant".
</span><span class="lines">@@ -300,11 +303,11 @@
</span><span class="cx">
</span><span class="cx"> // 28. Let ip be GetOption(options, "ignorePunctuation", "boolean", undefined, false).
</span><span class="cx"> bool usesFallback;
</span><del>- bool ignorePunctuation = intlBooleanOption(state, options, state.vm().propertyNames->ignorePunctuation, usesFallback);
</del><ins>+ bool ignorePunctuation = intlBooleanOption(state, options, vm.propertyNames->ignorePunctuation, usesFallback);
</ins><span class="cx"> if (usesFallback)
</span><span class="cx"> ignorePunctuation = false;
</span><span class="cx"> // 29. ReturnIfAbrupt(ip).
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> // 30. Set collator.[[ignorePunctuation]] to ip.
</span><span class="cx"> m_ignorePunctuation = ignorePunctuation;
</span><span class="lines">@@ -318,11 +321,13 @@
</span><span class="cx">
</span><span class="cx"> void IntlCollator::createCollator(ExecState& state)
</span><span class="cx"> {
</span><ins>+ VM& vm = state.vm();
+ auto scope = DECLARE_CATCH_SCOPE(vm);
</ins><span class="cx"> ASSERT(!m_collator);
</span><span class="cx">
</span><span class="cx"> if (!m_initializedCollator) {
</span><span class="cx"> initializeCollator(state, jsUndefined(), jsUndefined());
</span><del>- ASSERT(!state.hadException());
</del><ins>+ ASSERT_UNUSED(scope, !scope.exception());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> UErrorCode status = U_ZERO_ERROR;
</span><span class="lines">@@ -416,6 +421,9 @@
</span><span class="cx">
</span><span class="cx"> JSObject* IntlCollator::resolvedOptions(ExecState& state)
</span><span class="cx"> {
</span><ins>+ VM& vm = state.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> // 10.3.5 Intl.Collator.prototype.resolvedOptions() (ECMA-402 2.0)
</span><span class="cx"> // The function returns a new object whose properties and attributes are set as if
</span><span class="cx"> // constructed by an object literal assigning to each of the following properties the
</span><span class="lines">@@ -427,10 +435,9 @@
</span><span class="cx">
</span><span class="cx"> if (!m_initializedCollator) {
</span><span class="cx"> initializeCollator(state, jsUndefined(), jsUndefined());
</span><del>- ASSERT(!state.hadException());
</del><ins>+ ASSERT_UNUSED(scope, !scope.exception());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- VM& vm = state.vm();
</del><span class="cx"> JSObject* options = constructEmptyObject(&state);
</span><span class="cx"> options->putDirect(vm, vm.propertyNames->locale, jsString(&state, m_locale));
</span><span class="cx"> options->putDirect(vm, vm.propertyNames->usage, jsNontrivialString(&state, ASCIILiteral(usageString(m_usage))));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIntlCollatorConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/IntlCollatorConstructor.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/IntlCollatorConstructor.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/IntlCollatorConstructor.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -83,14 +83,16 @@
</span><span class="cx">
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL constructIntlCollator(ExecState* state)
</span><span class="cx"> {
</span><ins>+ VM& vm = state->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> // 10.1.2 Intl.Collator ([locales [, options]]) (ECMA-402 2.0)
</span><span class="cx"> // 1. If NewTarget is undefined, let newTarget be the active function object, else let newTarget be NewTarget.
</span><span class="cx"> // 2. Let collator be OrdinaryCreateFromConstructor(newTarget, %CollatorPrototype%).
</span><span class="cx"> // 3. ReturnIfAbrupt(collator).
</span><span class="cx"> Structure* structure = InternalFunction::createSubclassStructure(state, state->newTarget(), jsCast<IntlCollatorConstructor*>(state->callee())->collatorStructure());
</span><del>- if (state->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><del>- IntlCollator* collator = IntlCollator::create(state->vm(), structure);
</del><ins>+ IntlCollator* collator = IntlCollator::create(vm, structure);
</ins><span class="cx"> ASSERT(collator);
</span><span class="cx">
</span><span class="cx"> // 4. Return InitializeCollator(collator, locales, options).
</span><span class="lines">@@ -134,6 +136,8 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL IntlCollatorConstructorFuncSupportedLocalesOf(ExecState* state)
</span><span class="cx"> {
</span><ins>+ VM& vm = state->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> // 10.2.2 Intl.Collator.supportedLocalesOf(locales [, options]) (ECMA-402 2.0)
</span><span class="cx">
</span><span class="cx"> // 1. Let requestedLocales be CanonicalizeLocaleList(locales).
</span><span class="lines">@@ -140,7 +144,7 @@
</span><span class="cx"> Vector<String> requestedLocales = canonicalizeLocaleList(*state, state->argument(0));
</span><span class="cx">
</span><span class="cx"> // 2. ReturnIfAbrupt(requestedLocales).
</span><del>- if (state->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> // 3. Return SupportedLocales(%Collator%.[[availableLocales]], requestedLocales, options).
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIntlCollatorPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/IntlCollatorPrototype.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/IntlCollatorPrototype.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/IntlCollatorPrototype.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -78,6 +78,8 @@
</span><span class="cx">
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL IntlCollatorFuncCompare(ExecState* state)
</span><span class="cx"> {
</span><ins>+ VM& vm = state->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> // 10.3.4 Collator Compare Functions (ECMA-402 2.0)
</span><span class="cx"> // 1. Let collator be the this value.
</span><span class="cx"> // 2. Assert: Type(collator) is Object and collator has an [[initializedCollator]] internal slot whose value is true.
</span><span class="lines">@@ -88,13 +90,13 @@
</span><span class="cx"> // 5. Let X be ToString(x).
</span><span class="cx"> JSString* x = state->argument(0).toString(state);
</span><span class="cx"> // 6. ReturnIfAbrupt(X).
</span><del>- if (state->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> // 7. Let Y be ToString(y).
</span><span class="cx"> JSString* y = state->argument(1).toString(state);
</span><span class="cx"> // 8. ReturnIfAbrupt(Y).
</span><del>- if (state->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> // 9. Return CompareStrings(collator, X, Y).
</span><span class="lines">@@ -122,7 +124,7 @@
</span><span class="cx">
</span><span class="cx"> // c. Let bc be BoundFunctionCreate(F, «this value»).
</span><span class="cx"> boundCompare = JSBoundFunction::create(vm, state, globalObject, targetObject, collator, nullptr, 2, ASCIILiteral("compare"));
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> // d. Set collator.[[boundCompare]] to bc.
</span><span class="cx"> collator->setBoundCompare(vm, boundCompare);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIntlDateTimeFormatcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -215,6 +215,7 @@
</span><span class="cx"> {
</span><span class="cx"> // 12.1.1 ToDateTimeOptions abstract operation (ECMA-402 2.0)
</span><span class="cx"> VM& vm = exec.vm();
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx">
</span><span class="cx"> // 1. If options is undefined, then let options be null, else let options be ToObject(options).
</span><span class="cx"> // 2. ReturnIfAbrupt(options).
</span><span class="lines">@@ -224,7 +225,7 @@
</span><span class="cx"> options = constructEmptyObject(&exec, exec.lexicalGlobalObject()->nullPrototypeObjectStructure());
</span><span class="cx"> else {
</span><span class="cx"> JSObject* originalToObject = originalOptions.toObject(&exec);
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> options = constructEmptyObject(&exec, originalToObject);
</span><span class="cx"> }
</span><span class="lines">@@ -241,25 +242,25 @@
</span><span class="cx"> // iii. ReturnIfAbrupt(value).
</span><span class="cx"> // iv. If value is not undefined, then let needDefaults be false.
</span><span class="cx"> JSValue weekday = options->get(&exec, vm.propertyNames->weekday);
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> if (!weekday.isUndefined())
</span><span class="cx"> needDefaults = false;
</span><span class="cx">
</span><span class="cx"> JSValue year = options->get(&exec, vm.propertyNames->year);
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> if (!year.isUndefined())
</span><span class="cx"> needDefaults = false;
</span><span class="cx">
</span><span class="cx"> JSValue month = options->get(&exec, vm.propertyNames->month);
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> if (!month.isUndefined())
</span><span class="cx"> needDefaults = false;
</span><span class="cx">
</span><span class="cx"> JSValue day = options->get(&exec, vm.propertyNames->day);
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> if (!day.isUndefined())
</span><span class="cx"> needDefaults = false;
</span><span class="lines">@@ -273,19 +274,19 @@
</span><span class="cx"> // iii. ReturnIfAbrupt(value).
</span><span class="cx"> // iv. If value is not undefined, then let needDefaults be false.
</span><span class="cx"> JSValue hour = options->get(&exec, vm.propertyNames->hour);
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> if (!hour.isUndefined())
</span><span class="cx"> needDefaults = false;
</span><span class="cx">
</span><span class="cx"> JSValue minute = options->get(&exec, vm.propertyNames->minute);
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> if (!minute.isUndefined())
</span><span class="cx"> needDefaults = false;
</span><span class="cx">
</span><span class="cx"> JSValue second = options->get(&exec, vm.propertyNames->second);
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> if (!second.isUndefined())
</span><span class="cx"> needDefaults = false;
</span><span class="lines">@@ -299,15 +300,15 @@
</span><span class="cx"> JSString* numeric = jsNontrivialString(&exec, ASCIILiteral("numeric"));
</span><span class="cx">
</span><span class="cx"> options->putDirect(vm, vm.propertyNames->year, numeric);
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> options->putDirect(vm, vm.propertyNames->month, numeric);
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> options->putDirect(vm, vm.propertyNames->day, numeric);
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -428,13 +429,13 @@
</span><span class="cx"> // 3. Let requestedLocales be CanonicalizeLocaleList(locales).
</span><span class="cx"> Vector<String> requestedLocales = canonicalizeLocaleList(exec, locales);
</span><span class="cx"> // 4. ReturnIfAbrupt(requestedLocales),
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // 5. Let options be ToDateTimeOptions(options, "any", "date").
</span><span class="cx"> JSObject* options = toDateTimeOptionsAnyDate(exec, originalOptions);
</span><span class="cx"> // 6. ReturnIfAbrupt(options).
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // 7. Let opt be a new Record.
</span><span class="lines">@@ -443,7 +444,7 @@
</span><span class="cx"> // 8. Let matcher be GetOption(options, "localeMatcher", "string", «"lookup", "best fit"», "best fit").
</span><span class="cx"> String localeMatcher = intlStringOption(exec, options, vm.propertyNames->localeMatcher, { "lookup", "best fit" }, "localeMatcher must be either \"lookup\" or \"best fit\"", "best fit");
</span><span class="cx"> // 9. ReturnIfAbrupt(matcher).
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> // 10. Set opt.[[localeMatcher]] to matcher.
</span><span class="cx"> localeOpt.add(vm.propertyNames->localeMatcher.string(), localeMatcher);
</span><span class="lines">@@ -472,7 +473,7 @@
</span><span class="cx"> // 17. Let tz be Get(options, "timeZone").
</span><span class="cx"> JSValue tzValue = options->get(&exec, vm.propertyNames->timeZone);
</span><span class="cx"> // 18. ReturnIfAbrupt(tz).
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // 19. If tz is not undefined, then
</span><span class="lines">@@ -481,7 +482,7 @@
</span><span class="cx"> // a. Let tz be ToString(tz).
</span><span class="cx"> String originalTz = tzValue.toWTFString(&exec);
</span><span class="cx"> // b. ReturnIfAbrupt(tz).
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> // c. If the result of IsValidTimeZoneName(tz) is false, then i. Throw a RangeError exception.
</span><span class="cx"> // d. Let tz be CanonicalizeTimeZoneName(tz).
</span><span class="lines">@@ -514,7 +515,7 @@
</span><span class="cx"> auto shortLong = { "short", "long" };
</span><span class="cx">
</span><span class="cx"> String weekday = intlStringOption(exec, options, vm.propertyNames->weekday, narrowShortLong, "weekday must be \"narrow\", \"short\", or \"long\"", nullptr);
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> if (!weekday.isNull()) {
</span><span class="cx"> if (weekday == "narrow")
</span><span class="lines">@@ -526,7 +527,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String era = intlStringOption(exec, options, vm.propertyNames->era, narrowShortLong, "era must be \"narrow\", \"short\", or \"long\"", nullptr);
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> if (!era.isNull()) {
</span><span class="cx"> if (era == "narrow")
</span><span class="lines">@@ -538,7 +539,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String year = intlStringOption(exec, options, vm.propertyNames->year, twoDigitNumeric, "year must be \"2-digit\" or \"numeric\"", nullptr);
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> if (!year.isNull()) {
</span><span class="cx"> if (year == "2-digit")
</span><span class="lines">@@ -548,7 +549,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String month = intlStringOption(exec, options, vm.propertyNames->month, twoDigitNumericNarrowShortLong, "month must be \"2-digit\", \"numeric\", \"narrow\", \"short\", or \"long\"", nullptr);
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> if (!month.isNull()) {
</span><span class="cx"> if (month == "2-digit")
</span><span class="lines">@@ -564,7 +565,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String day = intlStringOption(exec, options, vm.propertyNames->day, twoDigitNumeric, "day must be \"2-digit\" or \"numeric\"", nullptr);
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> if (!day.isNull()) {
</span><span class="cx"> if (day == "2-digit")
</span><span class="lines">@@ -574,7 +575,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String hour = intlStringOption(exec, options, vm.propertyNames->hour, twoDigitNumeric, "hour must be \"2-digit\" or \"numeric\"", nullptr);
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // We need hour12 to make the hour skeleton pattern decision, so do this early.
</span><span class="lines">@@ -582,7 +583,7 @@
</span><span class="cx"> bool isHour12Undefined;
</span><span class="cx"> bool hr12 = intlBooleanOption(exec, options, vm.propertyNames->hour12, isHour12Undefined);
</span><span class="cx"> // 33. ReturnIfAbrupt(hr12).
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!hour.isNull()) {
</span><span class="lines">@@ -605,7 +606,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String minute = intlStringOption(exec, options, vm.propertyNames->minute, twoDigitNumeric, "minute must be \"2-digit\" or \"numeric\"", nullptr);
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> if (!minute.isNull()) {
</span><span class="cx"> if (minute == "2-digit")
</span><span class="lines">@@ -615,7 +616,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String second = intlStringOption(exec, options, vm.propertyNames->second, twoDigitNumeric, "second must be \"2-digit\" or \"numeric\"", nullptr);
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> if (!second.isNull()) {
</span><span class="cx"> if (second == "2-digit")
</span><span class="lines">@@ -625,7 +626,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String timeZoneName = intlStringOption(exec, options, vm.propertyNames->timeZoneName, shortLong, "timeZoneName must be \"short\" or \"long\"", nullptr);
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> if (!timeZoneName.isNull()) {
</span><span class="cx"> if (timeZoneName == "short")
</span><span class="lines">@@ -639,7 +640,7 @@
</span><span class="cx"> // 26. Let matcher be GetOption(options, "formatMatcher", "string", «"basic", "best fit"», "best fit").
</span><span class="cx"> intlStringOption(exec, options, vm.propertyNames->formatMatcher, { "basic", "best fit" }, "formatMatcher must be either \"basic\" or \"best fit\"", "best fit");
</span><span class="cx"> // 27. ReturnIfAbrupt(matcher).
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Always use ICU date format generator, rather than our own pattern list and matcher.
</span><span class="lines">@@ -834,15 +835,17 @@
</span><span class="cx">
</span><span class="cx"> JSObject* IntlDateTimeFormat::resolvedOptions(ExecState& exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> // 12.3.5 Intl.DateTimeFormat.prototype.resolvedOptions() (ECMA-402 2.0)
</span><span class="cx"> // The function returns a new object whose properties and attributes are set as if constructed by an object literal assigning to each of the following properties the value of the corresponding internal slot of this DateTimeFormat object (see 12.4): locale, calendar, numberingSystem, timeZone, hour12, weekday, era, year, month, day, hour, minute, second, and timeZoneName. Properties whose corresponding internal slots are not present are not assigned.
</span><span class="cx"> // Note: In this version of the ECMAScript 2015 Internationalization API, the timeZone property will be the name of the default time zone if no timeZone property was provided in the options object provided to the Intl.DateTimeFormat constructor. The previous version left the timeZone property undefined in this case.
</span><span class="cx"> if (!m_initializedDateTimeFormat) {
</span><span class="cx"> initializeDateTimeFormat(exec, jsUndefined(), jsUndefined());
</span><del>- ASSERT(!exec.hadException());
</del><ins>+ ASSERT_UNUSED(scope, !scope.exception());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- VM& vm = exec.vm();
</del><span class="cx"> JSObject* options = constructEmptyObject(&exec);
</span><span class="cx"> options->putDirect(vm, vm.propertyNames->locale, jsNontrivialString(&exec, m_locale));
</span><span class="cx"> options->putDirect(vm, vm.propertyNames->calendar, jsNontrivialString(&exec, m_calendar));
</span><span class="lines">@@ -889,7 +892,7 @@
</span><span class="cx"> // 12.3.4 FormatDateTime abstract operation (ECMA-402 2.0)
</span><span class="cx"> if (!m_initializedDateTimeFormat) {
</span><span class="cx"> initializeDateTimeFormat(exec, jsUndefined(), jsUndefined());
</span><del>- ASSERT(!exec.hadException());
</del><ins>+ ASSERT(!scope.exception());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // 1. If x is not a finite Number, then throw a RangeError exception.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIntlDateTimeFormatConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormatConstructor.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormatConstructor.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormatConstructor.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -83,14 +83,16 @@
</span><span class="cx">
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL constructIntlDateTimeFormat(ExecState* state)
</span><span class="cx"> {
</span><ins>+ VM& vm = state->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> // 12.1.2 Intl.DateTimeFormat ([locales [, options]]) (ECMA-402 2.0)
</span><span class="cx"> // 1. If NewTarget is undefined, let newTarget be the active function object, else let newTarget be NewTarget.
</span><span class="cx"> // 2. Let dateTimeFormat be OrdinaryCreateFromConstructor(newTarget, %DateTimeFormatPrototype%).
</span><span class="cx"> // 3. ReturnIfAbrupt(dateTimeFormat).
</span><span class="cx"> Structure* structure = InternalFunction::createSubclassStructure(state, state->newTarget(), jsCast<IntlDateTimeFormatConstructor*>(state->callee())->dateTimeFormatStructure());
</span><del>- if (state->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><del>- IntlDateTimeFormat* dateTimeFormat = IntlDateTimeFormat::create(state->vm(), structure);
</del><ins>+ IntlDateTimeFormat* dateTimeFormat = IntlDateTimeFormat::create(vm, structure);
</ins><span class="cx"> ASSERT(dateTimeFormat);
</span><span class="cx">
</span><span class="cx"> // 4. Return InitializeDateTimeFormat(dateTimeFormat, locales, options).
</span><span class="lines">@@ -134,6 +136,8 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL IntlDateTimeFormatConstructorFuncSupportedLocalesOf(ExecState* state)
</span><span class="cx"> {
</span><ins>+ VM& vm = state->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> // 12.2.2 Intl.DateTimeFormat.supportedLocalesOf(locales [, options]) (ECMA-402 2.0)
</span><span class="cx">
</span><span class="cx"> // 1. Let availableLocales be %DateTimeFormat%.[[availableLocales]].
</span><span class="lines">@@ -142,7 +146,7 @@
</span><span class="cx">
</span><span class="cx"> // 2. Let requestedLocales be CanonicalizeLocaleList(locales).
</span><span class="cx"> Vector<String> requestedLocales = canonicalizeLocaleList(*state, state->argument(0));
</span><del>- if (state->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> // 3. Return SupportedLocales(availableLocales, requestedLocales, options).
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIntlDateTimeFormatPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormatPrototype.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormatPrototype.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormatPrototype.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -82,6 +82,8 @@
</span><span class="cx">
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL IntlDateTimeFormatFuncFormatDateTime(ExecState* state)
</span><span class="cx"> {
</span><ins>+ VM& vm = state->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> // 12.3.4 DateTime Format Functions (ECMA-402 2.0)
</span><span class="cx"> // 1. Let dtf be the this value.
</span><span class="cx"> // 2. Assert: Type(dtf) is Object and dtf has an [[initializedDateTimeFormat]] internal slot whose value is true.
</span><span class="lines">@@ -99,7 +101,7 @@
</span><span class="cx"> // a. Let x be ToNumber(date).
</span><span class="cx"> value = date.toNumber(state);
</span><span class="cx"> // b. ReturnIfAbrupt(x).
</span><del>- if (state->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -138,7 +140,7 @@
</span><span class="cx">
</span><span class="cx"> // c. Let bf be BoundFunctionCreate(F, «this value»).
</span><span class="cx"> boundFormat = JSBoundFunction::create(vm, state, globalObject, targetObject, dtf, boundArgs, 1, ASCIILiteral("format"));
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> // d. Set dtf.[[boundFormat]] to bf.
</span><span class="cx"> dtf->setBoundFormat(vm, boundFormat);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIntlNumberFormatcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/IntlNumberFormat.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/IntlNumberFormat.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/IntlNumberFormat.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx"> // 3. Let requestedLocales be CanonicalizeLocaleList(locales).
</span><span class="cx"> auto requestedLocales = canonicalizeLocaleList(state, locales);
</span><span class="cx"> // 4. ReturnIfAbrupt(requestedLocales).
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // 5. If options is undefined, then
</span><span class="lines">@@ -176,7 +176,7 @@
</span><span class="cx"> // a. Let options be ToObject(options).
</span><span class="cx"> options = optionsValue.toObject(&state);
</span><span class="cx"> // b. ReturnIfAbrupt(options).
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -186,7 +186,7 @@
</span><span class="cx"> // 8. Let matcher be GetOption(options, "localeMatcher", "string", «"lookup", "best fit"», "best fit").
</span><span class="cx"> String matcher = intlStringOption(state, options, vm.propertyNames->localeMatcher, { "lookup", "best fit" }, "localeMatcher must be either \"lookup\" or \"best fit\"", "best fit");
</span><span class="cx"> // 9. ReturnIfAbrupt(matcher).
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> // 10. Set opt.[[localeMatcher]] to matcher.
</span><span class="cx"> opt.add(ASCIILiteral("localeMatcher"), matcher);
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx"> // 16. Let s be GetOption(options, "style", "string", « "decimal", "percent", "currency"», "decimal").
</span><span class="cx"> String styleString = intlStringOption(state, options, Identifier::fromString(&vm, "style"), { "decimal", "percent", "currency" }, "style must be either \"decimal\", \"percent\", or \"currency\"", "decimal");
</span><span class="cx"> // 17. ReturnIfAbrupt(s).
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> // 18. Set numberFormat.[[style]] to s.
</span><span class="cx"> if (styleString == "decimal")
</span><span class="lines">@@ -222,7 +222,7 @@
</span><span class="cx"> // 19. Let c be GetOption(options, "currency", "string", undefined, undefined).
</span><span class="cx"> String currency = intlStringOption(state, options, Identifier::fromString(&vm, "currency"), { }, nullptr, nullptr);
</span><span class="cx"> // 20. ReturnIfAbrupt(c).
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> // 21. If c is not undefined, then
</span><span class="cx"> if (!currency.isNull()) {
</span><span class="lines">@@ -253,7 +253,7 @@
</span><span class="cx"> // 24. Let cd be GetOption(options, "currencyDisplay", "string", «"code", "symbol", "name"», "symbol").
</span><span class="cx"> String currencyDisplayString = intlStringOption(state, options, Identifier::fromString(&vm, "currencyDisplay"), { "code", "symbol", "name" }, "currencyDisplay must be either \"code\", \"symbol\", or \"name\"", "symbol");
</span><span class="cx"> // 25. ReturnIfAbrupt(cd).
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> // 26. If s is "currency", set numberFormat.[[currencyDisplay]] to cd.
</span><span class="cx"> if (m_style == Style::Currency) {
</span><span class="lines">@@ -271,7 +271,7 @@
</span><span class="cx"> // 28. ReturnIfAbrupt(mnid).
</span><span class="cx"> // 29. Set numberFormat.[[minimumIntegerDigits]] to mnid.
</span><span class="cx"> unsigned minimumIntegerDigits = intlNumberOption(state, options, Identifier::fromString(&vm, "minimumIntegerDigits"), 1, 21, 1);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> m_minimumIntegerDigits = minimumIntegerDigits;
</span><span class="cx">
</span><span class="lines">@@ -282,7 +282,7 @@
</span><span class="cx"> // 32. ReturnIfAbrupt(mnfd).
</span><span class="cx"> // 33. Set numberFormat.[[minimumFractionDigits]] to mnfd.
</span><span class="cx"> unsigned minimumFractionDigits = intlNumberOption(state, options, Identifier::fromString(&vm, "minimumFractionDigits"), 0, 20, minimumFractionDigitsDefault);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> m_minimumFractionDigits = minimumFractionDigits;
</span><span class="cx">
</span><span class="lines">@@ -299,7 +299,7 @@
</span><span class="cx"> // 36. ReturnIfAbrupt(mxfd).
</span><span class="cx"> // 37. Set numberFormat.[[maximumFractionDigits]] to mxfd.
</span><span class="cx"> unsigned maximumFractionDigits = intlNumberOption(state, options, Identifier::fromString(&vm, "maximumFractionDigits"), minimumFractionDigits, 20, maximumFractionDigitsDefault);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> m_maximumFractionDigits = maximumFractionDigits;
</span><span class="cx">
</span><span class="lines">@@ -306,13 +306,13 @@
</span><span class="cx"> // 38. Let mnsd be Get(options, "minimumSignificantDigits").
</span><span class="cx"> JSValue minimumSignificantDigitsValue = options->get(&state, Identifier::fromString(&vm, "minimumSignificantDigits"));
</span><span class="cx"> // 39. ReturnIfAbrupt(mnsd).
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // 40. Let mxsd be Get(options, "maximumSignificantDigits").
</span><span class="cx"> JSValue maximumSignificantDigitsValue = options->get(&state, Identifier::fromString(&vm, "maximumSignificantDigits"));
</span><span class="cx"> // 41. ReturnIfAbrupt(mxsd).
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // 42. If mnsd is not undefined or mxsd is not undefined, then
</span><span class="lines">@@ -320,12 +320,12 @@
</span><span class="cx"> // a. Let mnsd be GetNumberOption(options, "minimumSignificantDigits", 1, 21, 1).
</span><span class="cx"> unsigned minimumSignificantDigits = intlNumberOption(state, options, Identifier::fromString(&vm, "minimumSignificantDigits"), 1, 21, 1);
</span><span class="cx"> // b. ReturnIfAbrupt(mnsd).
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> // c. Let mxsd be GetNumberOption(options, "maximumSignificantDigits", mnsd, 21, 21).
</span><span class="cx"> unsigned maximumSignificantDigits = intlNumberOption(state, options, Identifier::fromString(&vm, "maximumSignificantDigits"), minimumSignificantDigits, 21, 21);
</span><span class="cx"> // d. ReturnIfAbrupt(mxsd).
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> // e. Set numberFormat.[[minimumSignificantDigits]] to mnsd.
</span><span class="cx"> m_minimumSignificantDigits = minimumSignificantDigits;
</span><span class="lines">@@ -339,7 +339,7 @@
</span><span class="cx"> if (usesFallback)
</span><span class="cx"> useGrouping = true;
</span><span class="cx"> // 44. ReturnIfAbrupt(g).
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> // 45. Set numberFormat.[[useGrouping]] to g.
</span><span class="cx"> m_useGrouping = useGrouping;
</span><span class="lines">@@ -361,11 +361,14 @@
</span><span class="cx">
</span><span class="cx"> void IntlNumberFormat::createNumberFormat(ExecState& state)
</span><span class="cx"> {
</span><ins>+ VM& vm = state.vm();
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
</ins><span class="cx"> ASSERT(!m_numberFormat);
</span><span class="cx">
</span><span class="cx"> if (!m_initializedNumberFormat) {
</span><span class="cx"> initializeNumberFormat(state, jsUndefined(), jsUndefined());
</span><del>- ASSERT(!state.hadException());
</del><ins>+ ASSERT_UNUSED(scope, !scope.exception());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> UNumberFormatStyle style;
</span><span class="lines">@@ -479,6 +482,9 @@
</span><span class="cx">
</span><span class="cx"> JSObject* IntlNumberFormat::resolvedOptions(ExecState& state)
</span><span class="cx"> {
</span><ins>+ VM& vm = state.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> // 11.3.5 Intl.NumberFormat.prototype.resolvedOptions() (ECMA-402 2.0)
</span><span class="cx"> // The function returns a new object whose properties and attributes are set as if
</span><span class="cx"> // constructed by an object literal assigning to each of the following properties the
</span><span class="lines">@@ -490,10 +496,9 @@
</span><span class="cx">
</span><span class="cx"> if (!m_initializedNumberFormat) {
</span><span class="cx"> initializeNumberFormat(state, jsUndefined(), jsUndefined());
</span><del>- ASSERT(!state.hadException());
</del><ins>+ ASSERT_UNUSED(scope, !scope.exception());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- VM& vm = state.vm();
</del><span class="cx"> JSObject* options = constructEmptyObject(&state);
</span><span class="cx"> options->putDirect(vm, vm.propertyNames->locale, jsString(&state, m_locale));
</span><span class="cx"> options->putDirect(vm, Identifier::fromString(&vm, "numberingSystem"), jsString(&state, m_numberingSystem));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIntlNumberFormatConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/IntlNumberFormatConstructor.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/IntlNumberFormatConstructor.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/IntlNumberFormatConstructor.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -83,14 +83,16 @@
</span><span class="cx">
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL constructIntlNumberFormat(ExecState* state)
</span><span class="cx"> {
</span><ins>+ VM& vm = state->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> // 11.1.2 Intl.NumberFormat ([locales [, options]]) (ECMA-402 2.0)
</span><span class="cx"> // 1. If NewTarget is undefined, let newTarget be the active function object, else let newTarget be NewTarget.
</span><span class="cx"> // 2. Let numberFormat be OrdinaryCreateFromConstructor(newTarget, %NumberFormatPrototype%).
</span><span class="cx"> // 3. ReturnIfAbrupt(numberFormat).
</span><span class="cx"> Structure* structure = InternalFunction::createSubclassStructure(state, state->newTarget(), jsCast<IntlNumberFormatConstructor*>(state->callee())->numberFormatStructure());
</span><del>- if (state->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><del>- IntlNumberFormat* numberFormat = IntlNumberFormat::create(state->vm(), structure);
</del><ins>+ IntlNumberFormat* numberFormat = IntlNumberFormat::create(vm, structure);
</ins><span class="cx"> ASSERT(numberFormat);
</span><span class="cx">
</span><span class="cx"> // 4. Return InitializeNumberFormat(numberFormat, locales, options).
</span><span class="lines">@@ -134,6 +136,8 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL IntlNumberFormatConstructorFuncSupportedLocalesOf(ExecState* state)
</span><span class="cx"> {
</span><ins>+ VM& vm = state->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> // 11.2.2 Intl.NumberFormat.supportedLocalesOf(locales [, options]) (ECMA-402 2.0)
</span><span class="cx">
</span><span class="cx"> // 1. Let availableLocales be %NumberFormat%.[[availableLocales]].
</span><span class="lines">@@ -142,7 +146,7 @@
</span><span class="cx">
</span><span class="cx"> // 2. Let requestedLocales be CanonicalizeLocaleList(locales).
</span><span class="cx"> Vector<String> requestedLocales = canonicalizeLocaleList(*state, state->argument(0));
</span><del>- if (state->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> // 3. Return SupportedLocales(availableLocales, requestedLocales, options).
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIntlNumberFormatPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/IntlNumberFormatPrototype.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/IntlNumberFormatPrototype.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/IntlNumberFormatPrototype.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -80,6 +80,8 @@
</span><span class="cx">
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL IntlNumberFormatFuncFormatNumber(ExecState* state)
</span><span class="cx"> {
</span><ins>+ VM& vm = state->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> // 11.3.4 Format Number Functions (ECMA-402 2.0)
</span><span class="cx"> // 1. Let nf be the this value.
</span><span class="cx"> // 2. Assert: Type(nf) is Object and nf has an [[initializedNumberFormat]] internal slot whose value true.
</span><span class="lines">@@ -89,7 +91,7 @@
</span><span class="cx"> // 4. Let x be ToNumber(value).
</span><span class="cx"> double number = state->argument(0).toNumber(state);
</span><span class="cx"> // 5. ReturnIfAbrupt(x).
</span><del>- if (state->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> // 6. Return FormatNumber(nf, x).
</span><span class="lines">@@ -126,7 +128,7 @@
</span><span class="cx">
</span><span class="cx"> // c. Let bf be BoundFunctionCreate(F, «this value»).
</span><span class="cx"> boundFormat = JSBoundFunction::create(vm, state, globalObject, targetObject, nf, boundArgs, 1, ASCIILiteral("format"));
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> // d. Set nf.[[boundFormat]] to bf.
</span><span class="cx"> nf->setBoundFormat(vm, boundFormat);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIntlObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/IntlObject.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/IntlObject.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/IntlObject.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -124,6 +124,9 @@
</span><span class="cx">
</span><span class="cx"> bool intlBooleanOption(ExecState& state, JSValue options, PropertyName property, bool& usesFallback)
</span><span class="cx"> {
</span><ins>+ VM& vm = state.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> // 9.2.9 GetOption (options, property, type, values, fallback)
</span><span class="cx"> // For type="boolean". values is always undefined.
</span><span class="cx">
</span><span class="lines">@@ -131,7 +134,7 @@
</span><span class="cx"> JSObject* opts = options.toObject(&state);
</span><span class="cx">
</span><span class="cx"> // 2. ReturnIfAbrupt(opts).
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // 3. Let value be Get(opts, property).
</span><span class="lines">@@ -138,7 +141,7 @@
</span><span class="cx"> JSValue value = opts->get(&state, property);
</span><span class="cx">
</span><span class="cx"> // 4. ReturnIfAbrupt(value).
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // 5. If value is not undefined, then
</span><span class="lines">@@ -173,7 +176,7 @@
</span><span class="cx"> JSObject* opts = options.toObject(&state);
</span><span class="cx">
</span><span class="cx"> // 2. ReturnIfAbrupt(opts).
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return { };
</span><span class="cx">
</span><span class="cx"> // 3. Let value be Get(opts, property).
</span><span class="lines">@@ -180,7 +183,7 @@
</span><span class="cx"> JSValue value = opts->get(&state, property);
</span><span class="cx">
</span><span class="cx"> // 4. ReturnIfAbrupt(value).
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return { };
</span><span class="cx">
</span><span class="cx"> // 5. If value is not undefined, then
</span><span class="lines">@@ -193,7 +196,7 @@
</span><span class="cx"> String stringValue = value.toWTFString(&state);
</span><span class="cx">
</span><span class="cx"> // ii. ReturnIfAbrupt(value).
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return { };
</span><span class="cx">
</span><span class="cx"> // d. If values is not undefined, then
</span><span class="lines">@@ -221,7 +224,7 @@
</span><span class="cx"> JSObject* opts = options.toObject(&state);
</span><span class="cx">
</span><span class="cx"> // 2. ReturnIfAbrupt(opts).
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> // 3. Let value be Get(opts, property).
</span><span class="lines">@@ -228,7 +231,7 @@
</span><span class="cx"> JSValue value = opts->get(&state, property);
</span><span class="cx">
</span><span class="cx"> // 4. ReturnIfAbrupt(value).
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> // 5. If value is not undefined, then
</span><span class="lines">@@ -236,7 +239,7 @@
</span><span class="cx"> // a. Let value be ToNumber(value).
</span><span class="cx"> double doubleValue = value.toNumber(&state);
</span><span class="cx"> // b. ReturnIfAbrupt(value).
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return 0;
</span><span class="cx"> // 1. If value is NaN or less than minimum or greater than maximum, throw a RangeError exception.
</span><span class="cx"> if (!(doubleValue >= minimum && doubleValue <= maximum)) {
</span><span class="lines">@@ -557,16 +560,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // 5. ReturnIfAbrupt(O).
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return Vector<String>();
</span><span class="cx">
</span><span class="cx"> // 6. Let len be ToLength(Get(O, "length")).
</span><span class="cx"> JSValue lengthProperty = localesObject->get(&state, vm.propertyNames->length);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return Vector<String>();
</span><span class="cx">
</span><span class="cx"> double length = lengthProperty.toLength(&state);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return Vector<String>();
</span><span class="cx">
</span><span class="cx"> // Keep track of locales that have been added to the list.
</span><span class="lines">@@ -582,7 +585,7 @@
</span><span class="cx"> bool kPresent = localesObject->hasProperty(&state, k);
</span><span class="cx">
</span><span class="cx"> // c. ReturnIfAbrupt(kPresent).
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return Vector<String>();
</span><span class="cx">
</span><span class="cx"> // d. If kPresent is true, then
</span><span class="lines">@@ -591,7 +594,7 @@
</span><span class="cx"> JSValue kValue = localesObject->get(&state, k);
</span><span class="cx">
</span><span class="cx"> // ii. ReturnIfAbrupt(kValue).
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return Vector<String>();
</span><span class="cx">
</span><span class="cx"> // iii. If Type(kValue) is not String or Object, throw a TypeError exception.
</span><span class="lines">@@ -604,7 +607,7 @@
</span><span class="cx"> JSString* tag = kValue.toString(&state);
</span><span class="cx">
</span><span class="cx"> // v. ReturnIfAbrupt(tag).
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return Vector<String>();
</span><span class="cx">
</span><span class="cx"> // vi. If IsStructurallyValidLanguageTag(tag) is false, throw a RangeError exception.
</span><span class="lines">@@ -934,6 +937,7 @@
</span><span class="cx"> {
</span><span class="cx"> // 9.2.8 SupportedLocales (availableLocales, requestedLocales, options)
</span><span class="cx"> VM& vm = state.vm();
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> String matcher;
</span><span class="cx">
</span><span class="cx"> // 1. If options is not undefined, then
</span><span class="lines">@@ -941,7 +945,7 @@
</span><span class="cx"> // a. Let matcher be GetOption(options, "localeMatcher", "string", « "lookup", "best fit" », "best fit").
</span><span class="cx"> matcher = intlStringOption(state, options, vm.propertyNames->localeMatcher, { "lookup", "best fit" }, "localeMatcher must be either \"lookup\" or \"best fit\"", "best fit");
</span><span class="cx"> // b. ReturnIfAbrupt(matcher).
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> } else {
</span><span class="cx"> // 2. Else, let matcher be "best fit".
</span><span class="lines">@@ -961,7 +965,7 @@
</span><span class="cx"> supportedLocales = lookupSupportedLocales(state, availableLocales, requestedLocales);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> // 6. Let subset be CreateArrayFromList(supportedLocales).
</span><span class="lines">@@ -970,7 +974,7 @@
</span><span class="cx"> // 7. Let keys be subset.[[OwnPropertyKeys]]().
</span><span class="cx"> PropertyNameArray keys(&state, PropertyNameMode::Strings);
</span><span class="cx"> supportedLocales->getOwnPropertyNames(supportedLocales, &state, keys, EnumerationMode());
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> PropertyDescriptor desc;
</span><span class="lines">@@ -987,7 +991,7 @@
</span><span class="cx"> supportedLocales->defineOwnProperty(supportedLocales, &state, keys[i], desc, true);
</span><span class="cx">
</span><span class="cx"> // c. Assert: status is not abrupt completion.
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIntlObjectInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/IntlObjectInlines.h (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/IntlObjectInlines.h 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/IntlObjectInlines.h 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -40,15 +40,17 @@
</span><span class="cx"> // FIXME: Workaround to provide compatibility with ECMA-402 1.0 call/apply patterns.
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=153679
</span><span class="cx"> VM& vm = state.vm();
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> if (!jsDynamicCast<IntlInstance*>(thisValue)) {
</span><span class="cx"> JSValue prototype = callee->getDirect(vm, vm.propertyNames->prototype);
</span><span class="cx"> if (JSObject::defaultHasInstance(&state, thisValue, prototype)) {
</span><span class="cx"> JSObject* thisObject = thisValue.toObject(&state);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> IntlInstance* instance = factory(vm);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> thisObject->putDirect(vm, vm.propertyNames->builtinNames().intlSubstituteValuePrivateName(), instance);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIteratorOperationscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/IteratorOperations.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/IteratorOperations.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/IteratorOperations.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> JSValue nextFunction = iterator.get(exec, vm.propertyNames->next);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> CallData nextFunctionCallData;
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> if (!value.isEmpty())
</span><span class="cx"> nextFunctionArguments.append(value);
</span><span class="cx"> JSValue result = call(exec, nextFunction, nextFunctionCallType, nextFunctionCallData, iterator, nextFunctionArguments);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> if (!result.isObject())
</span><span class="lines">@@ -80,11 +80,14 @@
</span><span class="cx">
</span><span class="cx"> JSValue iteratorStep(ExecState* exec, JSValue iterator)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> JSValue result = iteratorNext(exec, iterator);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> bool done = iteratorComplete(exec, result);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> if (done)
</span><span class="cx"> return jsBoolean(false);
</span><span class="lines">@@ -94,20 +97,21 @@
</span><span class="cx"> void iteratorClose(ExecState* exec, JSValue iterator)
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><del>- auto scope = DECLARE_THROW_SCOPE(vm);
</del><ins>+ auto throwScope = DECLARE_THROW_SCOPE(vm);
+ auto catchScope = DECLARE_CATCH_SCOPE(vm);
</ins><span class="cx">
</span><span class="cx"> Exception* exception = nullptr;
</span><del>- if (exec->hadException()) {
- exception = exec->exception();
- exec->clearException();
</del><ins>+ if (UNLIKELY(catchScope.exception())) {
+ exception = catchScope.exception();
+ catchScope.clearException();
</ins><span class="cx"> }
</span><span class="cx"> JSValue returnFunction = iterator.get(exec, vm.propertyNames->returnKeyword);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (returnFunction.isUndefined()) {
</span><span class="cx"> if (exception)
</span><del>- throwException(exec, scope, exception);
</del><ins>+ throwException(exec, throwScope, exception);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -115,9 +119,9 @@
</span><span class="cx"> CallType returnFunctionCallType = getCallData(returnFunction, returnFunctionCallData);
</span><span class="cx"> if (returnFunctionCallType == CallType::None) {
</span><span class="cx"> if (exception)
</span><del>- throwException(exec, scope, exception);
</del><ins>+ throwException(exec, throwScope, exception);
</ins><span class="cx"> else
</span><del>- throwTypeError(exec, scope);
</del><ins>+ throwTypeError(exec, throwScope);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -125,15 +129,15 @@
</span><span class="cx"> JSValue innerResult = call(exec, returnFunction, returnFunctionCallType, returnFunctionCallData, iterator, returnFunctionArguments);
</span><span class="cx">
</span><span class="cx"> if (exception) {
</span><del>- throwException(exec, scope, exception);
</del><ins>+ throwException(exec, throwScope, exception);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!innerResult.isObject()) {
</span><del>- throwTypeError(exec, scope, ASCIILiteral("Iterator result interface is not an object."));
</del><ins>+ throwTypeError(exec, throwScope, ASCIILiteral("Iterator result interface is not an object."));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -167,7 +171,7 @@
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> JSValue iteratorFunction = iterable.get(state, state->propertyNames().iteratorSymbol);
</span><del>- if (state->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue();
</span><span class="cx">
</span><span class="cx"> CallData iteratorFunctionCallData;
</span><span class="lines">@@ -179,7 +183,7 @@
</span><span class="cx">
</span><span class="cx"> ArgList iteratorFunctionArguments;
</span><span class="cx"> JSValue iterator = call(state, iteratorFunction, iteratorFunctionCallType, iteratorFunctionCallData, iterable, iteratorFunctionArguments);
</span><del>- if (state->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue();
</span><span class="cx">
</span><span class="cx"> if (!iterator.isObject()) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIteratorOperationsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/IteratorOperations.h (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/IteratorOperations.h 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/IteratorOperations.h 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "JSCJSValue.h"
</span><span class="cx"> #include "JSObject.h"
</span><ins>+#include "ThrowScope.h"
</ins><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="lines">@@ -47,20 +48,22 @@
</span><span class="cx"> void forEachInIterable(ExecState* state, JSValue iterable, const CallBackType& callback)
</span><span class="cx"> {
</span><span class="cx"> auto& vm = state->vm();
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> JSValue iterator = iteratorForIterable(state, iterable);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> while (true) {
</span><span class="cx"> JSValue next = iteratorStep(state, iterator);
</span><del>- if (next.isFalse() || vm.exception())
</del><ins>+ if (next.isFalse() || UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> JSValue nextValue = iteratorValue(state, next);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> callback(vm, state, nextValue);
</span><del>- if (vm.exception()) {
</del><ins>+ if (UNLIKELY(scope.exception())) {
</ins><span class="cx"> iteratorClose(state, iterator);
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSArraycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSArray.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSArray.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/JSArray.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -654,7 +654,7 @@
</span><span class="cx"> unsigned index = getArrayLength() - 1;
</span><span class="cx"> // Let element be the result of calling the [[Get]] internal method of O with argument indx.
</span><span class="cx"> JSValue element = get(exec, index);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> // Call the [[Delete]] internal method of O with arguments indx and true.
</span><span class="cx"> if (!deletePropertyByIndex(this, exec, index)) {
</span><span class="lines">@@ -706,7 +706,7 @@
</span><span class="cx">
</span><span class="cx"> if (length > MAX_ARRAY_INDEX) {
</span><span class="cx"> methodTable(vm)->putByIndex(this, exec, length, value, true);
</span><del>- if (!exec->hadException())
</del><ins>+ if (!scope.exception())
</ins><span class="cx"> throwException(exec, scope, createRangeError(exec, ASCIILiteral("Invalid array length")));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -726,7 +726,7 @@
</span><span class="cx">
</span><span class="cx"> if (length > MAX_ARRAY_INDEX) {
</span><span class="cx"> methodTable(vm)->putByIndex(this, exec, length, value, true);
</span><del>- if (!exec->hadException())
</del><ins>+ if (!scope.exception())
</ins><span class="cx"> throwException(exec, scope, createRangeError(exec, ASCIILiteral("Invalid array length")));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -758,7 +758,7 @@
</span><span class="cx">
</span><span class="cx"> if (length > MAX_ARRAY_INDEX) {
</span><span class="cx"> methodTable(vm)->putByIndex(this, exec, length, value, true);
</span><del>- if (!exec->hadException())
</del><ins>+ if (!scope.exception())
</ins><span class="cx"> throwException(exec, scope, createRangeError(exec, ASCIILiteral("Invalid array length")));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -771,7 +771,7 @@
</span><span class="cx"> unsigned oldLength = length();
</span><span class="cx"> bool putResult = false;
</span><span class="cx"> if (attemptToInterceptPutByIndexOnHole(exec, oldLength, value, true, putResult)) {
</span><del>- if (!exec->hadException() && oldLength < 0xFFFFFFFFu)
</del><ins>+ if (!scope.exception() && oldLength < 0xFFFFFFFFu)
</ins><span class="cx"> setLength(exec, oldLength + 1, true);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -794,7 +794,7 @@
</span><span class="cx"> if (storage->length() > MAX_ARRAY_INDEX) {
</span><span class="cx"> methodTable(vm)->putByIndex(this, exec, storage->length(), value, true);
</span><span class="cx"> // Per ES5.1 15.4.4.7 step 6 & 15.4.5.1 step 3.d.
</span><del>- if (!exec->hadException())
</del><ins>+ if (!scope.exception())
</ins><span class="cx"> throwException(exec, scope, createRangeError(exec, ASCIILiteral("Invalid array length")));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -1257,6 +1257,9 @@
</span><span class="cx">
</span><span class="cx"> void JSArray::copyToArguments(ExecState* exec, VirtualRegister firstElementDest, unsigned offset, unsigned length)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> unsigned i = offset;
</span><span class="cx"> WriteBarrier<Unknown>* vector;
</span><span class="cx"> unsigned vectorEnd;
</span><span class="lines">@@ -1321,7 +1324,7 @@
</span><span class="cx">
</span><span class="cx"> for (; i < length; ++i) {
</span><span class="cx"> exec->r(firstElementDest + i - offset) = get(exec, i);
</span><del>- if (UNLIKELY(exec->vm().exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSArrayBufferConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSArrayBufferConstructor.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSArrayBufferConstructor.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/JSArrayBufferConstructor.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> unsigned length;
</span><span class="cx"> if (exec->argumentCount()) {
</span><span class="cx"> length = exec->uncheckedArgument(0).toUInt32(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> } else {
</span><span class="cx"> // Although the documentation doesn't say so, it is in fact correct to say
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> return JSValue::encode(throwOutOfMemoryError(exec, scope));
</span><span class="cx">
</span><span class="cx"> Structure* arrayBufferStructure = InternalFunction::createSubclassStructure(exec, exec->newTarget(), constructor->globalObject()->arrayBufferStructure());
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> JSArrayBuffer* result = JSArrayBuffer::create(vm, arrayBufferStructure, WTFMove(buffer));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSArrayBufferPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSArrayBufferPrototype.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSArrayBufferPrototype.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/JSArrayBufferPrototype.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -50,13 +50,13 @@
</span><span class="cx"> return throwVMTypeError(exec, scope, ASCIILiteral("Slice requires at least one argument."));
</span><span class="cx">
</span><span class="cx"> int32_t begin = exec->argument(0).toInt32(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> int32_t end;
</span><span class="cx"> if (exec->argumentCount() >= 2) {
</span><span class="cx"> end = exec->uncheckedArgument(1).toInt32(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> } else
</span><span class="cx"> end = thisObject->impl()->byteLength();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSArrayInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSArrayInlines.h (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSArrayInlines.h 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/JSArrayInlines.h 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -70,12 +70,13 @@
</span><span class="cx">
</span><span class="cx"> ALWAYS_INLINE unsigned getLength(ExecState* exec, JSObject* obj)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> if (isJSArray(obj))
</span><span class="cx"> return jsCast<JSArray*>(obj)->length();
</span><span class="cx">
</span><del>- VM& vm = exec->vm();
</del><span class="cx"> JSValue lengthValue = obj->get(exec, vm.propertyNames->length);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return UINT_MAX;
</span><span class="cx"> return lengthValue.toUInt32(exec);
</span><span class="cx"> }
</span><span class="lines">@@ -82,12 +83,13 @@
</span><span class="cx">
</span><span class="cx"> ALWAYS_INLINE double toLength(ExecState* exec, JSObject* obj)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> if (isJSArray(obj))
</span><span class="cx"> return jsCast<JSArray*>(obj)->length();
</span><span class="cx">
</span><del>- VM& vm = exec->vm();
</del><span class="cx"> JSValue lengthValue = obj->get(exec, vm.propertyNames->length);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return PNaN;
</span><span class="cx"> return lengthValue.toLength(exec);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSBoundFunctioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSBoundFunction.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSBoundFunction.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/JSBoundFunction.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -126,8 +126,9 @@
</span><span class="cx">
</span><span class="cx"> inline Structure* getBoundFunctionStructure(VM& vm, ExecState* exec, JSGlobalObject* globalObject, JSObject* targetFunction)
</span><span class="cx"> {
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSValue prototype = targetFunction->getPrototype(vm, exec);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> JSFunction* targetJSFunction = jsDynamicCast<JSFunction*>(targetFunction);
</span><span class="cx">
</span><span class="lines">@@ -158,6 +159,7 @@
</span><span class="cx">
</span><span class="cx"> JSBoundFunction* JSBoundFunction::create(VM& vm, ExecState* exec, JSGlobalObject* globalObject, JSObject* targetFunction, JSValue boundThis, JSArray* boundArgs, int length, const String& name)
</span><span class="cx"> {
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> ConstructData constructData;
</span><span class="cx"> ConstructType constructType = JSC::getConstructData(targetFunction, constructData);
</span><span class="cx"> bool canConstruct = constructType != ConstructType::None;
</span><span class="lines">@@ -170,7 +172,7 @@
</span><span class="cx"> canConstruct ? (slowCase ? boundFunctionConstruct : boundThisNoArgsFunctionConstruct) : callHostFunctionAsConstructor,
</span><span class="cx"> name);
</span><span class="cx"> Structure* structure = getBoundFunctionStructure(vm, exec, globalObject, targetFunction);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> JSBoundFunction* function = new (NotNull, allocateCell<JSBoundFunction>(vm.heap)) JSBoundFunction(vm, globalObject, structure, targetFunction, boundThis, boundArgs);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSCJSValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSCJSValue.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSCJSValue.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/JSCJSValue.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> prototype = obj->getPrototype(vm, exec);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> if (prototype.isNull())
</span><span class="cx"> break;
</span><span class="lines">@@ -215,7 +215,7 @@
</span><span class="cx">
</span><span class="cx"> JSObject* prototype = synthesizePrototype(exec);
</span><span class="cx"> if (UNLIKELY(!prototype)) {
</span><del>- ASSERT(exec->hadException());
</del><ins>+ ASSERT(scope.exception());
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> bool putResult = false;
</span><span class="lines">@@ -381,11 +381,11 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(isCell());
</span><span class="cx"> JSValue value = asCell()->toPrimitive(exec, PreferString);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return errorValue();
</span><span class="cx"> ASSERT(!value.isObject());
</span><span class="cx"> JSString* result = value.toString(exec);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return errorValue();
</span><span class="cx"> return result;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSCJSValueInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSCJSValueInlines.h (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSCJSValueInlines.h 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/JSCJSValueInlines.h 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -642,7 +642,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> StringImpl* hintString = jsCast<JSString*>(value)->value(exec).impl();
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return NoPreference;
</span><span class="cx">
</span><span class="cx"> if (WTF::equal(hintString, "default"))
</span><span class="lines">@@ -784,8 +784,9 @@
</span><span class="cx"> template<typename CallbackWhenNoException>
</span><span class="cx"> ALWAYS_INLINE typename std::result_of<CallbackWhenNoException(bool, PropertySlot&)>::type JSValue::getPropertySlot(ExecState* exec, PropertyName propertyName, PropertySlot& slot, CallbackWhenNoException callback) const
</span><span class="cx"> {
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(exec->vm());
</ins><span class="cx"> bool found = getPropertySlot(exec, propertyName, slot);
</span><del>- if (UNLIKELY(exec->hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return { };
</span><span class="cx"> return callback(found, slot);
</span><span class="cx"> }
</span><span class="lines">@@ -897,6 +898,7 @@
</span><span class="cx"> ALWAYS_INLINE bool JSValue::equalSlowCaseInline(ExecState* exec, JSValue v1, JSValue v2)
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> do {
</span><span class="cx"> if (v1.isNumber() && v2.isNumber())
</span><span class="cx"> return v1.asNumber() == v2.asNumber();
</span><span class="lines">@@ -924,7 +926,7 @@
</span><span class="cx"> if (v2.isObject())
</span><span class="cx"> return v1 == v2;
</span><span class="cx"> JSValue p1 = v1.toPrimitive(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> v1 = p1;
</span><span class="cx"> if (v1.isInt32() && v2.isInt32())
</span><span class="lines">@@ -934,7 +936,7 @@
</span><span class="cx">
</span><span class="cx"> if (v2.isObject()) {
</span><span class="cx"> JSValue p2 = v2.toPrimitive(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> v2 = p2;
</span><span class="cx"> if (v1.isInt32() && v2.isInt32())
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSDataViewPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSDataViewPrototype.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSDataViewPrototype.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/JSDataViewPrototype.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> return throwVMTypeError(exec, scope, ASCIILiteral("Need at least one argument (the byteOffset)"));
</span><span class="cx">
</span><span class="cx"> unsigned byteOffset = exec->uncheckedArgument(0).toUInt32(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> bool littleEndian = false;
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> unsigned elementSize = sizeof(typename Adaptor::Type);
</span><span class="cx"> if (elementSize > 1 && exec->argumentCount() >= 2) {
</span><span class="cx"> littleEndian = exec->uncheckedArgument(1).toBoolean(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx"> return throwVMTypeError(exec, scope, ASCIILiteral("Need at least two argument (the byteOffset and value)"));
</span><span class="cx">
</span><span class="cx"> unsigned byteOffset = exec->uncheckedArgument(0).toUInt32(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> const unsigned dataSize = sizeof(typename Adaptor::Type);
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> } u;
</span><span class="cx">
</span><span class="cx"> u.value = toNativeFromValue<Adaptor>(exec, exec->uncheckedArgument(1));
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> bool littleEndian = false;
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx"> unsigned elementSize = sizeof(typename Adaptor::Type);
</span><span class="cx"> if (elementSize > 1 && exec->argumentCount() >= 3) {
</span><span class="cx"> littleEndian = exec->uncheckedArgument(2).toBoolean(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSFunctioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSFunction.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSFunction.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/JSFunction.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -592,6 +592,8 @@
</span><span class="cx"> void JSFunction::setFunctionName(ExecState* exec, JSValue value)
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> // The "name" property may have been already been defined as part of a property list in an
</span><span class="cx"> // object literal (and therefore reified).
</span><span class="cx"> if (hasReifiedName())
</span><span class="lines">@@ -608,10 +610,10 @@
</span><span class="cx"> name = makeString('[', String(&uid), ']');
</span><span class="cx"> } else {
</span><span class="cx"> JSString* jsStr = value.toString(exec);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> name = jsStr->value(exec);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> reifyName(vm, exec, name);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGenericTypedArrayViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> typename Adaptor::Type value = toNativeFromValue<Adaptor>(exec, jsValue);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (isNeutered()) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGenericTypedArrayViewConstructorInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewConstructorInlines.h (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewConstructorInlines.h 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewConstructorInlines.h 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> MarkedArgumentBuffer storage;
</span><span class="cx"> while (true) {
</span><span class="cx"> JSValue next = iteratorStep(exec, iterator);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> if (next.isFalse())
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> JSValue nextItem = iteratorValue(exec, next);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> storage.append(nextItem);
</span><span class="lines">@@ -104,13 +104,13 @@
</span><span class="cx">
</span><span class="cx"> ViewClass* result = ViewClass::createUninitialized(exec, structure, storage.size());
</span><span class="cx"> if (!result) {
</span><del>- ASSERT(exec->hadException());
</del><ins>+ ASSERT(scope.exception());
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < storage.size(); ++i) {
</span><span class="cx"> if (!result->setIndex(exec, i, storage.at(i))) {
</span><del>- ASSERT(exec->hadException());
</del><ins>+ ASSERT(scope.exception());
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx"> object->getPropertySlot(exec, vm.propertyNames->length, lengthSlot);
</span><span class="cx">
</span><span class="cx"> JSValue iteratorFunc = object->get(exec, vm.propertyNames->iteratorSymbol);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> // We would like not use the iterator as it is painfully slow. Fortunately, unless
</span><span class="lines">@@ -183,7 +183,7 @@
</span><span class="cx">
</span><span class="cx"> ArgList arguments;
</span><span class="cx"> JSValue iterator = call(exec, iteratorFunc, callType, callData, object, arguments);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> return constructGenericTypedArrayViewFromIterator<ViewClass>(exec, structure, iterator);
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> length = lengthSlot.isUnset() ? 0 : lengthSlot.getValue(exec, vm.propertyNames->length).toUInt32(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx">
</span><span class="cx"> ViewClass* result = ViewClass::createUninitialized(exec, structure, length);
</span><span class="cx"> if (!result) {
</span><del>- ASSERT(exec->hadException());
</del><ins>+ ASSERT(scope.exception());
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -235,7 +235,7 @@
</span><span class="cx"> InternalFunction* function = asInternalFunction(exec->callee());
</span><span class="cx"> Structure* parentStructure = function->globalObject()->typedArrayStructure(ViewClass::TypedArrayStorageType);
</span><span class="cx"> Structure* structure = InternalFunction::createSubclassStructure(exec, exec->newTarget(), parentStructure);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx">
</span><span class="cx"> size_t argCount = exec->argumentCount();
</span><span class="lines">@@ -252,12 +252,12 @@
</span><span class="cx"> Optional<unsigned> length = Nullopt;
</span><span class="cx"> if (jsDynamicCast<JSArrayBuffer*>(firstValue) && argCount > 1) {
</span><span class="cx"> offset = exec->uncheckedArgument(1).toUInt32(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> if (argCount > 2) {
</span><span class="cx"> length = exec->uncheckedArgument(2).toUInt32(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGenericTypedArrayViewPrototypeFunctionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> JSValue constructor = exemplar->get(exec, exec->propertyNames().constructor);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> if (constructor.isUndefined())
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue species = constructor.get(exec, exec->propertyNames().speciesSymbol);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> if (species.isUndefinedOrNull())
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> return defaultConstructor();
</span><span class="cx">
</span><span class="cx"> JSValue result = construct(exec, species, args, "species is not a constructor");
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> if (JSArrayBufferView* view = jsDynamicCast<JSArrayBufferView*>(result)) {
</span><span class="lines">@@ -147,7 +147,6 @@
</span><span class="cx"> template<typename ViewClass>
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL genericTypedArrayViewProtoFuncCopyWithin(VM& vm, ExecState* exec)
</span><span class="cx"> {
</span><del>-// VM& vm = exec->vm();
</del><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> // 22.2.3.5
</span><span class="lines">@@ -157,13 +156,13 @@
</span><span class="cx">
</span><span class="cx"> long length = thisObject->length();
</span><span class="cx"> long to = argumentClampedIndexFromStartOrEnd(exec, 0, length);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return encodedJSValue();
</span><span class="cx"> long from = argumentClampedIndexFromStartOrEnd(exec, 1, length);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return encodedJSValue();
</span><span class="cx"> long final = argumentClampedIndexFromStartOrEnd(exec, 2, length, length);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return encodedJSValue();
</span><span class="cx">
</span><span class="cx"> if (final < from)
</span><span class="lines">@@ -183,7 +182,6 @@
</span><span class="cx"> template<typename ViewClass>
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL genericTypedArrayViewProtoFuncIncludes(VM& vm, ExecState* exec)
</span><span class="cx"> {
</span><del>-// VM& vm = exec->vm();
</del><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> ViewClass* thisObject = jsCast<ViewClass*>(exec->thisValue());
</span><span class="lines">@@ -198,7 +196,7 @@
</span><span class="cx"> JSValue valueToFind = exec->argument(0);
</span><span class="cx">
</span><span class="cx"> unsigned index = argumentClampedIndexFromStartOrEnd(exec, 1, length);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> if (thisObject->isNeutered())
</span><span class="lines">@@ -209,7 +207,7 @@
</span><span class="cx"> if (!targetOption)
</span><span class="cx"> return JSValue::encode(jsBoolean(false));
</span><span class="cx">
</span><del>- ASSERT(!vm.exception());
</del><ins>+ ASSERT(!scope.exception());
</ins><span class="cx"> RELEASE_ASSERT(!thisObject->isNeutered());
</span><span class="cx">
</span><span class="cx"> if (std::isnan(static_cast<double>(*targetOption))) {
</span><span class="lines">@@ -230,7 +228,6 @@
</span><span class="cx"> template<typename ViewClass>
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL genericTypedArrayViewProtoFuncIndexOf(VM& vm, ExecState* exec)
</span><span class="cx"> {
</span><del>-// VM& vm = exec->vm();
</del><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> // 22.2.3.13
</span><span class="lines">@@ -245,7 +242,7 @@
</span><span class="cx">
</span><span class="cx"> JSValue valueToFind = exec->argument(0);
</span><span class="cx"> unsigned index = argumentClampedIndexFromStartOrEnd(exec, 1, length);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return encodedJSValue();
</span><span class="cx">
</span><span class="cx"> if (thisObject->isNeutered())
</span><span class="lines">@@ -255,7 +252,7 @@
</span><span class="cx"> auto targetOption = ViewClass::toAdaptorNativeFromValueWithoutCoercion(valueToFind);
</span><span class="cx"> if (!targetOption)
</span><span class="cx"> return JSValue::encode(jsNumber(-1));
</span><del>- ASSERT(!vm.exception());
</del><ins>+ ASSERT(!scope.exception());
</ins><span class="cx"> RELEASE_ASSERT(!thisObject->isNeutered());
</span><span class="cx">
</span><span class="cx"> for (; index < length; ++index) {
</span><span class="lines">@@ -269,7 +266,6 @@
</span><span class="cx"> template<typename ViewClass>
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL genericTypedArrayViewProtoFuncJoin(VM& vm, ExecState* exec)
</span><span class="cx"> {
</span><del>-// VM& vm = exec->vm();
</del><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> ViewClass* thisObject = jsCast<ViewClass*>(exec->thisValue());
</span><span class="lines">@@ -282,11 +278,11 @@
</span><span class="cx"> unsigned length = thisObject->length();
</span><span class="cx">
</span><span class="cx"> JSStringJoiner joiner(*exec, separator, length);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> for (unsigned i = 0; i < length; i++) {
</span><span class="cx"> joiner.append(*exec, thisObject->getIndexQuickly(i));
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx"> return JSValue::encode(joiner.join(*exec));
</span><span class="lines">@@ -299,7 +295,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSString* separatorString = separatorValue.toString(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> if (thisObject->isNeutered())
</span><span class="lines">@@ -310,7 +306,6 @@
</span><span class="cx"> template<typename ViewClass>
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL genericTypedArrayViewProtoFuncLastIndexOf(VM& vm, ExecState* exec)
</span><span class="cx"> {
</span><del>-// VM& vm = exec->vm();
</del><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> // 22.2.3.16
</span><span class="lines">@@ -338,7 +333,7 @@
</span><span class="cx"> index = static_cast<unsigned>(fromDouble);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx">
</span><span class="cx"> if (thisObject->isNeutered())
</span><span class="lines">@@ -349,7 +344,7 @@
</span><span class="cx"> return JSValue::encode(jsNumber(-1));
</span><span class="cx">
</span><span class="cx"> typename ViewClass::ElementType* array = thisObject->typedVector();
</span><del>- ASSERT(!vm.exception());
</del><ins>+ ASSERT(!scope.exception());
</ins><span class="cx"> RELEASE_ASSERT(!thisObject->isNeutered());
</span><span class="cx">
</span><span class="cx"> for (; index >= 0; --index) {
</span><span class="lines">@@ -432,7 +427,6 @@
</span><span class="cx"> template<typename ViewClass>
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL genericTypedArrayViewProtoFuncSlice(VM& vm, ExecState* exec)
</span><span class="cx"> {
</span><del>-// VM& vm = exec->vm();
</del><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> // 22.2.3.26
</span><span class="lines">@@ -445,10 +439,10 @@
</span><span class="cx"> unsigned thisLength = thisObject->length();
</span><span class="cx">
</span><span class="cx"> unsigned begin = argumentClampedIndexFromStartOrEnd(exec, 0, thisLength);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return encodedJSValue();
</span><span class="cx"> unsigned end = argumentClampedIndexFromStartOrEnd(exec, 1, thisLength, thisLength);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return encodedJSValue();
</span><span class="cx">
</span><span class="cx"> if (thisObject->isNeutered())
</span><span class="lines">@@ -467,7 +461,7 @@
</span><span class="cx"> Structure* structure = callee->globalObject()->typedArrayStructure(ViewClass::TypedArrayStorageType);
</span><span class="cx"> return ViewClass::createUninitialized(exec, structure, length);
</span><span class="cx"> });
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx">
</span><span class="cx"> ASSERT(!result->isNeutered());
</span><span class="lines">@@ -518,7 +512,6 @@
</span><span class="cx"> template<typename ViewClass>
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL genericTypedArrayViewPrivateFuncSubarrayCreate(VM&vm, ExecState* exec)
</span><span class="cx"> {
</span><del>-// VM& vm = exec->vm();
</del><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> // 22.2.3.23
</span><span class="lines">@@ -537,9 +530,9 @@
</span><span class="cx"> ASSERT(exec->argument(0).isNumber());
</span><span class="cx"> ASSERT(exec->argument(1).isUndefined() || exec->argument(1).isNumber());
</span><span class="cx"> unsigned begin = argumentClampedIndexFromStartOrEnd(exec, 0, thisLength);
</span><del>- ASSERT(!vm.exception());
</del><ins>+ ASSERT(!scope.exception());
</ins><span class="cx"> unsigned end = argumentClampedIndexFromStartOrEnd(exec, 1, thisLength, thisLength);
</span><del>- ASSERT(!vm.exception());
</del><ins>+ ASSERT(!scope.exception());
</ins><span class="cx">
</span><span class="cx"> RELEASE_ASSERT(!thisObject->isNeutered());
</span><span class="cx">
</span><span class="lines">@@ -572,7 +565,7 @@
</span><span class="cx"> args.append(jsNumber(length));
</span><span class="cx">
</span><span class="cx"> JSObject* result = construct(exec, species, args, "species is not a constructor");
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx">
</span><span class="cx"> if (jsDynamicCast<JSArrayBufferView*>(result))
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
</span><del>- * Copyright (C) 2007, 2008, 2009, 2014-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2007-2009, 2014-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="cx"> * modify it under the terms of the GNU Library General Public
</span><span class="lines">@@ -815,12 +815,14 @@
</span><span class="cx">
</span><span class="cx"> inline JSArray* constructEmptyArray(ExecState* exec, ArrayAllocationProfile* profile, JSGlobalObject* globalObject, unsigned initialLength = 0, JSValue newTarget = JSValue())
</span><span class="cx"> {
</span><ins>+ VM& vm = globalObject->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> Structure* structure;
</span><span class="cx"> if (initialLength >= MIN_ARRAY_STORAGE_CONSTRUCTION_LENGTH)
</span><span class="cx"> structure = globalObject->arrayStructureForIndexingTypeDuringAllocation(exec, ArrayWithArrayStorage, newTarget);
</span><span class="cx"> else
</span><span class="cx"> structure = globalObject->arrayStructureForProfileDuringAllocation(exec, profile, newTarget);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> return ArrayAllocationProfile::updateLastAllocationFor(profile, JSArray::create(exec->vm(), structure, initialLength));
</span><span class="lines">@@ -833,8 +835,10 @@
</span><span class="cx">
</span><span class="cx"> inline JSArray* constructArray(ExecState* exec, ArrayAllocationProfile* profile, JSGlobalObject* globalObject, const ArgList& values, JSValue newTarget = JSValue())
</span><span class="cx"> {
</span><ins>+ VM& vm = globalObject->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> Structure* structure = globalObject->arrayStructureForProfileDuringAllocation(exec, profile, newTarget);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> return ArrayAllocationProfile::updateLastAllocationFor(profile, constructArray(exec, structure, values));
</span><span class="cx"> }
</span><span class="lines">@@ -846,8 +850,10 @@
</span><span class="cx">
</span><span class="cx"> inline JSArray* constructArray(ExecState* exec, ArrayAllocationProfile* profile, JSGlobalObject* globalObject, const JSValue* values, unsigned length, JSValue newTarget = JSValue())
</span><span class="cx"> {
</span><ins>+ VM& vm = globalObject->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> Structure* structure = globalObject->arrayStructureForProfileDuringAllocation(exec, profile, newTarget);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> return ArrayAllocationProfile::updateLastAllocationFor(profile, constructArray(exec, structure, values, length));
</span><span class="cx"> }
</span><span class="lines">@@ -859,8 +865,10 @@
</span><span class="cx">
</span><span class="cx"> inline JSArray* constructArrayNegativeIndexed(ExecState* exec, ArrayAllocationProfile* profile, JSGlobalObject* globalObject, const JSValue* values, unsigned length, JSValue newTarget = JSValue())
</span><span class="cx"> {
</span><ins>+ VM& vm = globalObject->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> Structure* structure = globalObject->arrayStructureForProfileDuringAllocation(exec, profile, newTarget);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> return ArrayAllocationProfile::updateLastAllocationFor(profile, constructArrayNegativeIndexed(exec, structure, values, length));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjectFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -660,7 +660,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String s = x.toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> if (s.is8Bit()) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSJobcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSJob.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSJob.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/JSJob.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -62,6 +62,9 @@
</span><span class="cx">
</span><span class="cx"> void JSJobMicrotask::run(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
</ins><span class="cx"> CallData handlerCallData;
</span><span class="cx"> CallType handlerCallType = getCallData(m_job.get(), handlerCallData);
</span><span class="cx"> ASSERT(handlerCallType != CallType::None);
</span><span class="lines">@@ -70,7 +73,7 @@
</span><span class="cx"> for (unsigned index = 0, length = m_arguments->length(); index < length; ++index)
</span><span class="cx"> handlerArguments.append(m_arguments->JSArray::get(exec, index));
</span><span class="cx"> profiledCall(exec, ProfilingReason::Microtask, m_job.get(), handlerCallType, handlerCallData, jsUndefined(), handlerArguments);
</span><del>- exec->vm().clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSModuleEnvironmentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSModuleEnvironment.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSModuleEnvironment.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/JSModuleEnvironment.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -78,6 +78,8 @@
</span><span class="cx">
</span><span class="cx"> bool JSModuleEnvironment::getOwnPropertySlot(JSObject* cell, ExecState* exec, PropertyName propertyName, PropertySlot& slot)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSModuleEnvironment* thisObject = jsCast<JSModuleEnvironment*>(cell);
</span><span class="cx"> JSModuleRecord::Resolution resolution = thisObject->moduleRecord()->resolveImport(exec, Identifier::fromUid(exec, propertyName.uid()));
</span><span class="cx"> if (resolution.type == JSModuleRecord::Resolution::Type::Resolved) {
</span><span class="lines">@@ -84,11 +86,11 @@
</span><span class="cx"> // When resolveImport resolves the resolution, the imported module environment must have the binding.
</span><span class="cx"> JSModuleEnvironment* importedModuleEnvironment = resolution.moduleRecord->moduleEnvironment();
</span><span class="cx"> PropertySlot redirectSlot(importedModuleEnvironment, PropertySlot::InternalMethodType::Get);
</span><del>- bool result = importedModuleEnvironment->methodTable(exec->vm())->getOwnPropertySlot(importedModuleEnvironment, exec, resolution.localName, redirectSlot);
</del><ins>+ bool result = importedModuleEnvironment->methodTable(vm)->getOwnPropertySlot(importedModuleEnvironment, exec, resolution.localName, redirectSlot);
</ins><span class="cx"> ASSERT_UNUSED(result, result);
</span><span class="cx"> ASSERT(redirectSlot.isValue());
</span><span class="cx"> JSValue value = redirectSlot.getValue(exec, resolution.localName);
</span><del>- ASSERT(!exec->hadException());
</del><ins>+ ASSERT_UNUSED(scope, !scope.exception());
</ins><span class="cx"> slot.setValue(thisObject, redirectSlot.attributes(), value);
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSModuleLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSModuleLoader.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSModuleLoader.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/JSModuleLoader.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -152,13 +152,15 @@
</span><span class="cx"> dataLog("Loader [fetch] ", printableModuleKey(exec, key), "\n");
</span><span class="cx">
</span><span class="cx"> JSGlobalObject* globalObject = exec->lexicalGlobalObject();
</span><ins>+ VM& vm = globalObject->vm();
+ auto scope = DECLARE_CATCH_SCOPE(vm);
</ins><span class="cx"> if (globalObject->globalObjectMethodTable()->moduleLoaderFetch)
</span><span class="cx"> return globalObject->globalObjectMethodTable()->moduleLoaderFetch(globalObject, exec, this, key, initiator);
</span><span class="cx"> JSInternalPromiseDeferred* deferred = JSInternalPromiseDeferred::create(exec, globalObject);
</span><span class="cx"> String moduleKey = key.toString(exec)->value(exec);
</span><del>- if (exec->hadException()) {
- JSValue exception = exec->exception()->value();
- exec->clearException();
</del><ins>+ if (UNLIKELY(scope.exception())) {
+ JSValue exception = scope.exception()->value();
+ scope.clearException();
</ins><span class="cx"> deferred->reject(exec, exception);
</span><span class="cx"> return deferred->promise();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSModuleNamespaceObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSModuleNamespaceObject.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSModuleNamespaceObject.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/JSModuleNamespaceObject.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx"> void JSModuleNamespaceObject::finishCreation(ExecState* exec, JSGlobalObject* globalObject, JSModuleRecord* moduleRecord, const IdentifierSet& exports)
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> Base::finishCreation(vm);
</span><span class="cx"> ASSERT(inherits(info()));
</span><span class="cx">
</span><span class="lines">@@ -77,7 +78,7 @@
</span><span class="cx"> // http://www.ecma-international.org/ecma-262/6.0/#sec-module-namespace-exotic-objects-isextensible
</span><span class="cx"> // http://www.ecma-international.org/ecma-262/6.0/#sec-module-namespace-exotic-objects-preventextensions
</span><span class="cx"> methodTable(vm)->preventExtensions(this, exec);
</span><del>- ASSERT(!exec->hadException());
</del><ins>+ ASSERT_UNUSED(scope, !scope.exception());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSModuleNamespaceObject::destroy(JSCell* cell)
</span><span class="lines">@@ -132,7 +133,7 @@
</span><span class="cx"> ASSERT_UNUSED(found, found);
</span><span class="cx">
</span><span class="cx"> JSValue value = trampolineSlot.getValue(exec, propertyName);
</span><del>- ASSERT(!exec->hadException());
</del><ins>+ ASSERT(!scope.exception());
</ins><span class="cx">
</span><span class="cx"> // If the value is filled with TDZ value, throw a reference error.
</span><span class="cx"> if (!value) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSModuleRecordcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSModuleRecord.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSModuleRecord.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/JSModuleRecord.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -778,7 +778,7 @@
</span><span class="cx"> JSModuleRecord* importedModule = hostResolveImportedModule(exec, importEntry.moduleRequest);
</span><span class="cx"> if (importEntry.isNamespace(vm)) {
</span><span class="cx"> JSModuleNamespaceObject* namespaceObject = importedModule->getModuleNamespace(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> bool putResult = false;
</span><span class="cx"> symbolTablePutTouchWatchpointSet(moduleEnvironment, exec, importEntry.localName, namespaceObject, /* shouldThrowReadOnlyError */ false, /* ignoreReadOnlyErrors */ true, putResult);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSONObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSONObject.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSONObject.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/JSONObject.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -220,6 +220,8 @@
</span><span class="cx"> , m_replacerCallType(CallType::None)
</span><span class="cx"> , m_gap(gap(exec, space.get()))
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> if (!m_replacer.isObject())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -226,10 +228,10 @@
</span><span class="cx"> if (m_replacer.asObject()->inherits(JSArray::info())) {
</span><span class="cx"> m_usingArrayReplacer = true;
</span><span class="cx"> Handle<JSObject> array = m_replacer.asObject();
</span><del>- unsigned length = array->get(exec, exec->vm().propertyNames->length).toUInt32(exec);
</del><ins>+ unsigned length = array->get(exec, vm.propertyNames->length).toUInt32(exec);
</ins><span class="cx"> for (unsigned i = 0; i < length; ++i) {
</span><span class="cx"> JSValue name = array->get(exec, i);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> if (name.isObject()) {
</span><span class="lines">@@ -248,36 +250,39 @@
</span><span class="cx">
</span><span class="cx"> Local<Unknown> Stringifier::stringify(Handle<Unknown> value)
</span><span class="cx"> {
</span><ins>+ VM& vm = m_exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSObject* object = constructEmptyObject(m_exec);
</span><del>- if (m_exec->hadException())
- return Local<Unknown>(m_exec->vm(), jsNull());
</del><ins>+ if (UNLIKELY(scope.exception()))
+ return Local<Unknown>(vm, jsNull());
</ins><span class="cx">
</span><del>- PropertyNameForFunctionCall emptyPropertyName(m_exec->vm().propertyNames->emptyIdentifier);
- object->putDirect(m_exec->vm(), m_exec->vm().propertyNames->emptyIdentifier, value.get());
</del><ins>+ PropertyNameForFunctionCall emptyPropertyName(vm.propertyNames->emptyIdentifier);
+ object->putDirect(vm, vm.propertyNames->emptyIdentifier, value.get());
</ins><span class="cx">
</span><span class="cx"> StringBuilder result;
</span><span class="cx"> if (appendStringifiedValue(result, value.get(), object, emptyPropertyName) != StringifySucceeded)
</span><del>- return Local<Unknown>(m_exec->vm(), jsUndefined());
- if (m_exec->hadException())
- return Local<Unknown>(m_exec->vm(), jsNull());
</del><ins>+ return Local<Unknown>(vm, jsUndefined());
+ if (UNLIKELY(scope.exception()))
+ return Local<Unknown>(vm, jsNull());
</ins><span class="cx">
</span><del>- return Local<Unknown>(m_exec->vm(), jsString(m_exec, result.toString()));
</del><ins>+ return Local<Unknown>(vm, jsString(m_exec, result.toString()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ALWAYS_INLINE JSValue Stringifier::toJSON(JSValue value, const PropertyNameForFunctionCall& propertyName)
</span><span class="cx"> {
</span><del>- ASSERT(!m_exec->hadException());
</del><ins>+ VM& vm = m_exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+ ASSERT(!scope.exception());
</ins><span class="cx"> if (!value.isObject())
</span><span class="cx"> return value;
</span><span class="cx">
</span><span class="cx"> JSObject* object = asObject(value);
</span><del>- VM& vm = m_exec->vm();
</del><span class="cx"> PropertySlot slot(object, PropertySlot::InternalMethodType::Get);
</span><span class="cx"> if (!object->getPropertySlot(m_exec, vm.propertyNames->toJSON, slot))
</span><span class="cx"> return value;
</span><span class="cx">
</span><span class="cx"> JSValue toJSONFunction = slot.getValue(m_exec, vm.propertyNames->toJSON);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsNull();
</span><span class="cx"> return toJSONImpl(value, toJSONFunction, propertyName);
</span><span class="cx"> }
</span><span class="lines">@@ -301,7 +306,7 @@
</span><span class="cx">
</span><span class="cx"> // Call the toJSON function.
</span><span class="cx"> value = toJSON(value, propertyName);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return StringifyFailed;
</span><span class="cx">
</span><span class="cx"> // Call the replacer function.
</span><span class="lines">@@ -310,7 +315,7 @@
</span><span class="cx"> args.append(propertyName.value(m_exec));
</span><span class="cx"> args.append(value);
</span><span class="cx"> value = call(m_exec, m_replacer.get(), m_replacerCallType, m_replacerCallData, holder, args);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return StringifyFailed;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -324,7 +329,7 @@
</span><span class="cx">
</span><span class="cx"> value = unwrapBoxedPrimitive(m_exec, value);
</span><span class="cx">
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return StringifyFailed;
</span><span class="cx">
</span><span class="cx"> if (value.isBoolean()) {
</span><span class="lines">@@ -377,7 +382,7 @@
</span><span class="cx">
</span><span class="cx"> bool holderStackWasEmpty = m_holderStack.isEmpty();
</span><span class="cx"> m_holderStack.append(Holder(vm, m_exec, object));
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return StringifyFailed;
</span><span class="cx"> if (!holderStackWasEmpty)
</span><span class="cx"> return StringifySucceeded;
</span><span class="lines">@@ -384,7 +389,7 @@
</span><span class="cx">
</span><span class="cx"> do {
</span><span class="cx"> while (m_holderStack.last().appendNextProperty(*this, builder)) {
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return StringifyFailed;
</span><span class="cx"> }
</span><span class="cx"> m_holderStack.removeLast();
</span><span class="lines">@@ -436,6 +441,8 @@
</span><span class="cx"> ASSERT(m_index <= m_size);
</span><span class="cx">
</span><span class="cx"> ExecState* exec = stringifier.m_exec;
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx">
</span><span class="cx"> // First time through, initialize.
</span><span class="cx"> if (!m_index) {
</span><span class="lines">@@ -444,7 +451,7 @@
</span><span class="cx"> if (m_isJSArray)
</span><span class="cx"> m_size = asArray(m_object.get())->length();
</span><span class="cx"> else
</span><del>- m_size = m_object->get(exec, exec->vm().propertyNames->length).toUInt32(exec);
</del><ins>+ m_size = m_object->get(exec, vm.propertyNames->length).toUInt32(exec);
</ins><span class="cx"> builder.append('[');
</span><span class="cx"> } else {
</span><span class="cx"> if (stringifier.m_usingArrayReplacer)
</span><span class="lines">@@ -452,7 +459,7 @@
</span><span class="cx"> else {
</span><span class="cx"> PropertyNameArray objectPropertyNames(exec, PropertyNameMode::Strings);
</span><span class="cx"> m_object->methodTable()->getOwnPropertyNames(m_object.get(), exec, objectPropertyNames, EnumerationMode());
</span><del>- if (UNLIKELY(exec->hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> m_propertyNames = objectPropertyNames.releaseData();
</span><span class="cx"> }
</span><span class="lines">@@ -486,7 +493,7 @@
</span><span class="cx"> value = slot.getValue(exec, index);
</span><span class="cx"> else
</span><span class="cx"> value = jsUndefined();
</span><del>- if (UNLIKELY(exec->hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -504,7 +511,7 @@
</span><span class="cx"> if (!m_object->methodTable()->getOwnPropertySlot(m_object.get(), exec, propertyName, slot))
</span><span class="cx"> return true;
</span><span class="cx"> JSValue value = slot.getValue(exec, propertyName);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> rollBackPoint = builder.length();
</span><span class="lines">@@ -640,7 +647,7 @@
</span><span class="cx"> inValue = slot.getValue(m_exec, index);
</span><span class="cx"> else
</span><span class="cx"> inValue = jsUndefined();
</span><del>- if (m_exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsNull();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -658,7 +665,7 @@
</span><span class="cx"> array->methodTable()->deletePropertyByIndex(array, m_exec, indexStack.last());
</span><span class="cx"> else
</span><span class="cx"> array->putDirectIndex(m_exec, indexStack.last(), filteredValue);
</span><del>- if (m_exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsNull();
</span><span class="cx"> indexStack.last()++;
</span><span class="cx"> goto arrayStartVisitMember;
</span><span class="lines">@@ -675,7 +682,7 @@
</span><span class="cx"> indexStack.append(0);
</span><span class="cx"> propertyStack.append(PropertyNameArray(m_exec, PropertyNameMode::Strings));
</span><span class="cx"> object->methodTable()->getOwnPropertyNames(object, m_exec, propertyStack.last(), EnumerationMode());
</span><del>- if (UNLIKELY(m_exec->hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsNull();
</span><span class="cx"> }
</span><span class="cx"> objectStartVisitMember:
</span><span class="lines">@@ -698,7 +705,7 @@
</span><span class="cx"> inValue = jsUndefined();
</span><span class="cx">
</span><span class="cx"> // The holder may be modified by the reviver function so any lookup may throw
</span><del>- if (m_exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsNull();
</span><span class="cx">
</span><span class="cx"> if (inValue.isObject()) {
</span><span class="lines">@@ -717,7 +724,7 @@
</span><span class="cx"> object->methodTable()->deleteProperty(object, m_exec, prop);
</span><span class="cx"> else
</span><span class="cx"> object->methodTable()->put(object, m_exec, prop, filteredValue, slot);
</span><del>- if (m_exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsNull();
</span><span class="cx"> indexStack.last()++;
</span><span class="cx"> goto objectStartVisitMember;
</span><span class="lines">@@ -754,7 +761,7 @@
</span><span class="cx"> if (!exec->argumentCount())
</span><span class="cx"> return throwVMError(exec, scope, createError(exec, ASCIILiteral("JSON.parse requires at least one parameter")));
</span><span class="cx"> JSString::SafeView source = exec->uncheckedArgument(0).toString(exec)->view(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsNull());
</span><span class="cx">
</span><span class="cx"> JSValue unfiltered;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSObject.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSObject.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/JSObject.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -351,6 +351,7 @@
</span><span class="cx"> // 3. ES6 Proxy.
</span><span class="cx">
</span><span class="cx"> VM& vm = exec->vm();
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSObject* current = object;
</span><span class="cx"> PropertyDescriptor ownDescriptor;
</span><span class="cx"> while (true) {
</span><span class="lines">@@ -362,13 +363,13 @@
</span><span class="cx">
</span><span class="cx"> // 9.1.9.1-2 Let ownDesc be ? O.[[GetOwnProperty]](P).
</span><span class="cx"> bool ownDescriptorFound = current->getOwnPropertyDescriptor(exec, propertyName, ownDescriptor);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (!ownDescriptorFound) {
</span><span class="cx"> // 9.1.9.1-3-a Let parent be ? O.[[GetPrototypeOf]]().
</span><span class="cx"> JSValue prototype = current->getPrototype(vm, exec);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // 9.1.9.1-3-b If parent is not null, then
</span><span class="lines">@@ -400,7 +401,7 @@
</span><span class="cx"> JSObject* receiverObject = asObject(receiver);
</span><span class="cx"> PropertyDescriptor existingDescriptor;
</span><span class="cx"> bool existingDescriptorFound = receiverObject->getOwnPropertyDescriptor(exec, propertyName, existingDescriptor);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // 9.1.9.1-4-d If existingDescriptor is not undefined, then
</span><span class="lines">@@ -1292,7 +1293,7 @@
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> bool isExtensible = this->isExtensible(exec);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (!isExtensible) {
</span><span class="lines">@@ -1552,7 +1553,7 @@
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> JSValue function = object->get(exec, propertyName);
</span><del>- if (scope.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return scope.exception();
</span><span class="cx"> if (function.isUndefined() && mode == TypeHintMode::TakesHint)
</span><span class="cx"> return JSValue();
</span><span class="lines">@@ -1580,7 +1581,7 @@
</span><span class="cx">
</span><span class="cx"> JSValue result = call(exec, function, callType, callData, const_cast<JSObject*>(object), callArgs);
</span><span class="cx"> ASSERT(!result.isGetterSetter());
</span><del>- if (scope.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return scope.exception();
</span><span class="cx"> if (result.isObject())
</span><span class="cx"> return mode == TypeHintMode::DoesNotTakeHint ? JSValue() : throwTypeError(exec, scope, ASCIILiteral("Symbol.toPrimitive returned an object"));
</span><span class="lines">@@ -1618,7 +1619,7 @@
</span><span class="cx"> return value;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ASSERT(!exec->hadException());
</del><ins>+ ASSERT(!scope.exception());
</ins><span class="cx">
</span><span class="cx"> return throwTypeError(exec, scope, ASCIILiteral("No default value"));
</span><span class="cx"> }
</span><span class="lines">@@ -1718,7 +1719,7 @@
</span><span class="cx"> JSObject* object = asObject(value);
</span><span class="cx"> while (true) {
</span><span class="cx"> JSValue objectValue = object->getPrototype(vm, exec);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> if (!objectValue.isObject())
</span><span class="cx"> return false;
</span><span class="lines">@@ -1740,12 +1741,13 @@
</span><span class="cx"> void JSObject::getPropertyNames(JSObject* object, ExecState* exec, PropertyNameArray& propertyNames, EnumerationMode mode)
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> object->methodTable(vm)->getOwnPropertyNames(object, exec, propertyNames, mode);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> JSValue nextProto = object->getPrototype(vm, exec);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> if (nextProto.isNull())
</span><span class="cx"> return;
</span><span class="lines">@@ -1757,10 +1759,10 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> prototype->methodTable(vm)->getOwnPropertyNames(prototype, exec, propertyNames, mode);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> nextProto = prototype->getPrototype(vm, exec);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> if (nextProto.isNull())
</span><span class="cx"> break;
</span><span class="lines">@@ -1858,8 +1860,10 @@
</span><span class="cx">
</span><span class="cx"> double JSObject::toNumber(ExecState* exec) const
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSValue primitive = toPrimitive(exec, PreferNumber);
</span><del>- if (exec->hadException()) // should be picked up soon in Nodes.cpp
</del><ins>+ if (UNLIKELY(scope.exception())) // should be picked up soon in Nodes.cpp
</ins><span class="cx"> return 0.0;
</span><span class="cx"> return primitive.toNumber(exec);
</span><span class="cx"> }
</span><span class="lines">@@ -1866,8 +1870,10 @@
</span><span class="cx">
</span><span class="cx"> JSString* JSObject::toString(ExecState* exec) const
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSValue primitive = toPrimitive(exec, PreferString);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsEmptyString(exec);
</span><span class="cx"> return primitive.toString(exec);
</span><span class="cx"> }
</span><span class="lines">@@ -3076,15 +3082,18 @@
</span><span class="cx">
</span><span class="cx"> bool JSObject::defineOwnNonIndexProperty(ExecState* exec, PropertyName propertyName, const PropertyDescriptor& descriptor, bool throwException)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto throwScope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> // Track on the globaldata that we're in define property.
</span><span class="cx"> // Currently DefineOwnProperty uses delete to remove properties when they are being replaced
</span><span class="cx"> // (particularly when changing attributes), however delete won't allow non-configurable (i.e.
</span><span class="cx"> // DontDelete) properties to be deleted. For now, we can use this flag to make this work.
</span><del>- VM::DeletePropertyModeScope scope(exec->vm(), VM::DeletePropertyMode::IgnoreConfigurable);
</del><ins>+ VM::DeletePropertyModeScope scope(vm, VM::DeletePropertyMode::IgnoreConfigurable);
</ins><span class="cx"> PropertyDescriptor current;
</span><span class="cx"> bool isCurrentDefined = getOwnPropertyDescriptor(exec, propertyName, current);
</span><span class="cx"> bool isExtensible = this->isExtensible(exec);
</span><del>- if (UNLIKELY(exec->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> return validateAndApplyPropertyDescriptor(exec, this, propertyName, isExtensible, descriptor, isCurrentDefined, current, throwException);
</span><span class="cx"> }
</span><span class="lines">@@ -3184,12 +3193,13 @@
</span><span class="cx"> void JSObject::getGenericPropertyNames(JSObject* object, ExecState* exec, PropertyNameArray& propertyNames, EnumerationMode mode)
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> object->methodTable(vm)->getOwnPropertyNames(object, exec, propertyNames, EnumerationMode(mode, JSObjectPropertiesMode::Exclude));
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> JSValue nextProto = object->getPrototype(vm, exec);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> if (nextProto.isNull())
</span><span class="cx"> return;
</span><span class="lines">@@ -3201,10 +3211,10 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> prototype->methodTable(vm)->getOwnPropertyNames(prototype, exec, propertyNames, mode);
</span><del>- if (UNLIKELY(exec->hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> nextProto = prototype->getPrototype(vm, exec);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> if (nextProto.isNull())
</span><span class="cx"> break;
</span><span class="lines">@@ -3220,7 +3230,7 @@
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> JSValue method = get(exec, ident);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> if (!method.isCell()) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSObjectInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSObjectInlines.h (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSObjectInlines.h 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/JSObjectInlines.h 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -40,16 +40,16 @@
</span><span class="cx">
</span><span class="cx"> Vector<JSValue> result;
</span><span class="cx"> JSValue lengthProperty = arrayLikeValue.get(exec, vm.propertyNames->length);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> double lengthAsDouble = lengthProperty.toLength(exec);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> RELEASE_ASSERT(lengthAsDouble >= 0.0 && lengthAsDouble == std::trunc(lengthAsDouble));
</span><span class="cx"> uint64_t length = static_cast<uint64_t>(lengthAsDouble);
</span><span class="cx"> for (uint64_t index = 0; index < length; index++) {
</span><span class="cx"> JSValue next = arrayLikeValue.get(exec, index);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> RuntimeType type = runtimeTypeForValue(next);
</span><span class="lines">@@ -96,8 +96,10 @@
</span><span class="cx"> template<typename CallbackWhenNoException>
</span><span class="cx"> ALWAYS_INLINE typename std::result_of<CallbackWhenNoException(bool, PropertySlot&)>::type JSObject::getPropertySlot(ExecState* exec, PropertyName propertyName, PropertySlot& slot, CallbackWhenNoException callback) const
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> bool found = const_cast<JSObject*>(this)->getPropertySlot(exec, propertyName, slot);
</span><del>- if (UNLIKELY(exec->hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return { };
</span><span class="cx"> return callback(found, slot);
</span><span class="cx"> }
</span><span class="lines">@@ -105,6 +107,7 @@
</span><span class="cx"> ALWAYS_INLINE bool JSObject::getPropertySlot(ExecState* exec, unsigned propertyName, PropertySlot& slot)
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> auto& structureIDTable = vm.heap.structureIDTable();
</span><span class="cx"> JSObject* object = this;
</span><span class="cx"> MethodTable::GetPrototypeFunctionPtr defaultGetPrototype = JSObject::getPrototype;
</span><span class="lines">@@ -112,7 +115,7 @@
</span><span class="cx"> Structure& structure = *structureIDTable.get(object->structureID());
</span><span class="cx"> if (structure.classInfo()->methodTable.getOwnPropertySlotByIndex(object, exec, propertyName, slot))
</span><span class="cx"> return true;
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> JSValue prototype;
</span><span class="cx"> if (LIKELY(structure.classInfo()->methodTable.getPrototype == defaultGetPrototype || slot.internalMethodType() == PropertySlot::InternalMethodType::VMInquiry))
</span><span class="lines">@@ -119,7 +122,7 @@
</span><span class="cx"> prototype = structure.storedPrototype();
</span><span class="cx"> else {
</span><span class="cx"> prototype = object->getPrototype(vm, exec);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> if (!prototype.isObject())
</span><span class="lines">@@ -134,6 +137,7 @@
</span><span class="cx"> ASSERT(!parseIndex(propertyName));
</span><span class="cx">
</span><span class="cx"> VM& vm = exec->vm();
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> auto& structureIDTable = vm.heap.structureIDTable();
</span><span class="cx"> JSObject* object = this;
</span><span class="cx"> MethodTable::GetPrototypeFunctionPtr defaultGetPrototype = JSObject::getPrototype;
</span><span class="lines">@@ -145,7 +149,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> if (structure.classInfo()->methodTable.getOwnPropertySlot(object, exec, propertyName, slot))
</span><span class="cx"> return true;
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> JSValue prototype;
</span><span class="lines">@@ -153,7 +157,7 @@
</span><span class="cx"> prototype = structure.storedPrototype();
</span><span class="cx"> else {
</span><span class="cx"> prototype = object->getPrototype(vm, exec);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> if (!prototype.isObject())
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSPromiseConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSPromiseConstructor.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSPromiseConstructor.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/JSPromiseConstructor.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> return throwVMTypeError(exec, scope);
</span><span class="cx">
</span><span class="cx"> Structure* promiseStructure = InternalFunction::createSubclassStructure(exec, exec->newTarget(), globalObject->promiseStructure());
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> JSPromise* promise = JSPromise::create(vm, promiseStructure);
</span><span class="cx"> promise->initialize(exec, globalObject, exec->argument(0));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSPropertyNameEnumeratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSPropertyNameEnumerator.h (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSPropertyNameEnumerator.h 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/JSPropertyNameEnumerator.h 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -102,6 +102,7 @@
</span><span class="cx"> inline JSPropertyNameEnumerator* propertyNameEnumerator(ExecState* exec, JSObject* base)
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx">
</span><span class="cx"> uint32_t indexedLength = base->methodTable(vm)->getEnumerableLength(exec, base);
</span><span class="cx">
</span><span class="lines">@@ -119,18 +120,18 @@
</span><span class="cx">
</span><span class="cx"> if (structure->canAccessPropertiesQuicklyForEnumeration() && indexedLength == base->getArrayLength()) {
</span><span class="cx"> base->methodTable(vm)->getStructurePropertyNames(base, exec, propertyNames, EnumerationMode());
</span><del>- ASSERT(!exec->hadException());
</del><ins>+ ASSERT(!scope.exception());
</ins><span class="cx">
</span><span class="cx"> numberStructureProperties = propertyNames.size();
</span><span class="cx">
</span><span class="cx"> base->methodTable(vm)->getGenericPropertyNames(base, exec, propertyNames, EnumerationMode());
</span><del>- ASSERT(!exec->hadException());
</del><ins>+ ASSERT(!scope.exception());
</ins><span class="cx"> } else {
</span><span class="cx"> // Generic property names vector contains all indexed property names.
</span><span class="cx"> // So disable indexed property enumeration phase by setting |indexedLength| to 0.
</span><span class="cx"> indexedLength = 0;
</span><span class="cx"> base->methodTable(vm)->getPropertyNames(base, exec, propertyNames, EnumerationMode());
</span><del>- if (UNLIKELY(exec->hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSPropertyNameIteratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSPropertyNameIterator.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSPropertyNameIterator.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/JSPropertyNameIterator.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -55,8 +55,10 @@
</span><span class="cx">
</span><span class="cx"> JSPropertyNameIterator* JSPropertyNameIterator::create(ExecState* exec, Structure* structure, JSObject* iteratedObject)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSPropertyNameEnumerator* enumerator = propertyNameEnumerator(exec, iteratedObject);
</span><del>- if (UNLIKELY(exec->hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> return JSPropertyNameIterator::create(exec, structure, iteratedObject, enumerator);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSScope.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSScope.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/JSScope.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -200,16 +200,18 @@
</span><span class="cx"> // When an exception occurs, the result of isUnscopable becomes false.
</span><span class="cx"> static inline bool isUnscopable(ExecState* exec, JSScope* scope, JSObject* object, const Identifier& ident)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto throwScope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> if (scope->type() != WithScopeType)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> JSValue unscopables = object->get(exec, exec->propertyNames().unscopablesSymbol);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> if (!unscopables.isObject())
</span><span class="cx"> return false;
</span><span class="cx"> JSValue blocked = jsCast<JSObject*>(unscopables)->get(exec, ident);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return blocked.toBoolean(exec);
</span><span class="lines">@@ -218,6 +220,7 @@
</span><span class="cx"> JSObject* JSScope::resolve(ExecState* exec, JSScope* scope, const Identifier& ident)
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><ins>+ auto throwScope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> ScopeChainIterator end = scope->end();
</span><span class="cx"> ScopeChainIterator it = scope->begin();
</span><span class="cx"> while (1) {
</span><span class="lines">@@ -240,7 +243,7 @@
</span><span class="cx"> if (object->hasProperty(exec, ident)) {
</span><span class="cx"> if (!isUnscopable(exec, scope, object, ident))
</span><span class="cx"> return object;
</span><del>- ASSERT_WITH_MESSAGE(!exec->hadException(), "When an exception occurs, the result of isUnscopable becomes false");
</del><ins>+ ASSERT_WITH_MESSAGE_UNUSED(throwScope, !throwScope.exception(), "When an exception occurs, the result of isUnscopable becomes false");
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSStringcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSString.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSString.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/JSString.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -74,9 +74,11 @@
</span><span class="cx">
</span><span class="cx"> bool JSString::equalSlowCase(ExecState* exec, JSString* other) const
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> String str1 = value(exec);
</span><span class="cx"> String str2 = other->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> return WTF::equal(*str1.impl(), *str2.impl());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSStringJoinercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSStringJoiner.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSStringJoiner.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/JSStringJoiner.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> ASSERT(m_strings.size() <= m_strings.capacity());
</span><span class="cx">
</span><span class="cx"> unsigned length = joinedLength(state);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> if (!length)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeLiteralParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/LiteralParser.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/LiteralParser.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/LiteralParser.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -572,6 +572,8 @@
</span><span class="cx"> template <typename CharType>
</span><span class="cx"> JSValue LiteralParser<CharType>::parse(ParserState initialState)
</span><span class="cx"> {
</span><ins>+ VM& vm = m_exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> ParserState state = initialState;
</span><span class="cx"> MarkedArgumentBuffer objectStack;
</span><span class="cx"> JSValue lastValue;
</span><span class="lines">@@ -583,7 +585,7 @@
</span><span class="cx"> startParseArray:
</span><span class="cx"> case StartParseArray: {
</span><span class="cx"> JSArray* array = constructEmptyArray(m_exec, 0);
</span><del>- if (UNLIKELY(m_exec->hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue();
</span><span class="cx"> objectStack.append(array);
</span><span class="cx"> }
</span><span class="lines">@@ -681,7 +683,7 @@
</span><span class="cx"> {
</span><span class="cx"> JSObject* object = asObject(objectStack.last());
</span><span class="cx"> PropertyName ident = identifierStack.last();
</span><del>- if (m_mode != StrictJSON && ident == m_exec->vm().propertyNames->underscoreProto) {
</del><ins>+ if (m_mode != StrictJSON && ident == vm.propertyNames->underscoreProto) {
</ins><span class="cx"> if (!visitedUnderscoreProto.add(object).isNewEntry) {
</span><span class="cx"> m_parseErrorMessage = ASCIILiteral("Attempted to redefine __proto__ property");
</span><span class="cx"> return JSValue();
</span><span class="lines">@@ -693,7 +695,7 @@
</span><span class="cx"> if (Optional<uint32_t> index = parseIndex(ident))
</span><span class="cx"> object->putDirectIndex(m_exec, index.value(), lastValue);
</span><span class="cx"> else
</span><del>- object->putDirect(m_exec->vm(), ident, lastValue);
</del><ins>+ object->putDirect(vm, ident, lastValue);
</ins><span class="cx"> }
</span><span class="cx"> identifierStack.removeLast();
</span><span class="cx"> if (m_lexer.currentToken()->type == TokComma)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeMapConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/MapConstructor.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/MapConstructor.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/MapConstructor.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> return JSValue::encode(map);
</span><span class="cx">
</span><span class="cx"> JSValue adderFunction = map->JSObject::get(exec, exec->propertyNames().set);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> CallData adderFunctionCallData;
</span><span class="lines">@@ -80,6 +80,7 @@
</span><span class="cx"> return JSValue::encode(throwTypeError(exec, scope));
</span><span class="cx">
</span><span class="cx"> forEachInIterable(exec, iterable, [&](VM& vm, ExecState* exec, JSValue nextItem) {
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> if (!nextItem.isObject()) {
</span><span class="cx"> throwTypeError(exec, scope);
</span><span class="cx"> return;
</span><span class="lines">@@ -86,11 +87,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue key = nextItem.get(exec, static_cast<unsigned>(0));
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> JSValue value = nextItem.get(exec, static_cast<unsigned>(1));
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> MarkedArgumentBuffer arguments;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeMathObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/MathObject.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/MathObject.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/MathObject.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -162,8 +162,10 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL mathProtoFuncClz32(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> uint32_t value = exec->argument(0).toUInt32(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsNull());
</span><span class="cx"> return JSValue::encode(JSValue(clz32(value)));
</span><span class="cx"> }
</span><span class="lines">@@ -185,6 +187,8 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL mathProtoFuncHypot(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> unsigned argsCount = exec->argumentCount();
</span><span class="cx"> double max = 0;
</span><span class="cx"> Vector<double, 8> args;
</span><span class="lines">@@ -191,7 +195,7 @@
</span><span class="cx"> args.reserveInitialCapacity(argsCount);
</span><span class="cx"> for (unsigned i = 0; i < argsCount; ++i) {
</span><span class="cx"> args.uncheckedAppend(exec->uncheckedArgument(i).toNumber(exec));
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsNull());
</span><span class="cx"> if (std::isinf(args[i]))
</span><span class="cx"> return JSValue::encode(jsDoubleNumber(+std::numeric_limits<double>::infinity()));
</span><span class="lines">@@ -292,8 +296,10 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL mathProtoFuncIMul(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> int32_t left = exec->argument(0).toInt32(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsNull());
</span><span class="cx"> int32_t right = exec->argument(1).toInt32(exec);
</span><span class="cx"> return JSValue::encode(jsNumber(left * right));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeModuleLoaderPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ModuleLoaderPrototype.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ModuleLoaderPrototype.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/ModuleLoaderPrototype.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -112,11 +112,11 @@
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> const Identifier moduleKey = exec->argument(0).toPropertyKey(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> String source = exec->argument(1).toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> SourceCode sourceCode = makeSource(source, moduleKey.impl());
</span><span class="lines">@@ -142,12 +142,14 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL moduleLoaderPrototypeRequestedModules(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSModuleRecord* moduleRecord = jsDynamicCast<JSModuleRecord*>(exec->argument(0));
</span><span class="cx"> if (!moduleRecord)
</span><span class="cx"> return JSValue::encode(constructEmptyArray(exec, nullptr));
</span><span class="cx">
</span><span class="cx"> JSArray* result = constructEmptyArray(exec, nullptr, moduleRecord->requestedModules().size());
</span><del>- if (UNLIKELY(exec->hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> JSValue::encode(jsUndefined());
</span><span class="cx"> size_t i = 0;
</span><span class="cx"> for (auto& key : moduleRecord->requestedModules())
</span><span class="lines">@@ -158,6 +160,8 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL moduleLoaderPrototypeModuleDeclarationInstantiation(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSModuleRecord* moduleRecord = jsDynamicCast<JSModuleRecord*>(exec->argument(0));
</span><span class="cx"> if (!moduleRecord)
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -166,7 +170,7 @@
</span><span class="cx"> dataLog("Loader [link] ", moduleRecord->moduleKey(), "\n");
</span><span class="cx">
</span><span class="cx"> moduleRecord->link(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeNativeErrorConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/NativeErrorConstructor.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/NativeErrorConstructor.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/NativeErrorConstructor.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -63,9 +63,11 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL Interpreter::constructWithNativeErrorConstructor(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSValue message = exec->argument(0);
</span><span class="cx"> Structure* errorStructure = InternalFunction::createSubclassStructure(exec, exec->newTarget(), jsCast<NativeErrorConstructor*>(exec->callee())->errorStructure());
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> ASSERT(errorStructure);
</span><span class="cx"> return JSValue::encode(ErrorInstance::create(exec, errorStructure, message, nullptr, TypeNothing, false));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeNumberConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/NumberConstructor.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/NumberConstructor.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/NumberConstructor.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -85,9 +85,11 @@
</span><span class="cx"> // ECMA 15.7.1
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL constructWithNumberConstructor(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> double n = exec->argumentCount() ? exec->uncheckedArgument(0).toNumber(exec) : 0;
</span><span class="cx"> Structure* structure = InternalFunction::createSubclassStructure(exec, exec->newTarget(), exec->lexicalGlobalObject()->numberObjectStructure());
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx">
</span><span class="cx"> NumberObject* object = NumberObject::create(exec->vm(), structure);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeObjectConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -121,6 +121,8 @@
</span><span class="cx"> {
</span><span class="cx"> ObjectConstructor* objectConstructor = jsCast<ObjectConstructor*>(exec->callee());
</span><span class="cx"> JSGlobalObject* globalObject = objectConstructor->globalObject();
</span><ins>+ VM& vm = globalObject->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx">
</span><span class="cx"> // We need to check newTarget condition in this caller side instead of InternalFunction::createSubclassStructure side.
</span><span class="cx"> // Since if we found this condition is met, we should not fall into the type conversion in the step 3.
</span><span class="lines">@@ -129,7 +131,7 @@
</span><span class="cx"> if (newTarget && newTarget != objectConstructor) {
</span><span class="cx"> // a. Return ? OrdinaryCreateFromConstructor(NewTarget, "%ObjectPrototype%").
</span><span class="cx"> Structure* objectStructure = InternalFunction::createSubclassStructure(exec, newTarget, globalObject->objectStructureForObjectConstructor());
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> return constructEmptyObject(exec, objectStructure);
</span><span class="cx"> }
</span><span class="lines">@@ -211,8 +213,10 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL objectConstructorGetPrototypeOf(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSObject* object = exec->argument(0).toObject(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> return JSValue::encode(objectConstructorGetPrototypeOf(exec, object));
</span><span class="cx"> }
</span><span class="lines">@@ -231,7 +235,7 @@
</span><span class="cx"> return throwVMTypeError(exec, scope);
</span><span class="cx">
</span><span class="cx"> JSObject* object = objectValue.toObject(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(objectValue);
</span><span class="cx">
</span><span class="cx"> if (!checkProtoSetterAccessAllowed(exec, object)) {
</span><span class="lines">@@ -241,16 +245,18 @@
</span><span class="cx">
</span><span class="cx"> bool shouldThrowIfCantSet = true;
</span><span class="cx"> bool didSetPrototype = object->setPrototype(vm, exec, protoValue, shouldThrowIfCantSet);
</span><del>- ASSERT_UNUSED(didSetPrototype, vm.exception() || didSetPrototype);
</del><ins>+ ASSERT_UNUSED(didSetPrototype, scope.exception() || didSetPrototype);
</ins><span class="cx"> return JSValue::encode(objectValue);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue objectConstructorGetOwnPropertyDescriptor(ExecState* exec, JSObject* object, const Identifier& propertyName)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> PropertyDescriptor descriptor;
</span><span class="cx"> if (!object->getOwnPropertyDescriptor(exec, propertyName, descriptor))
</span><span class="cx"> return jsUndefined();
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> JSObject* result = constructObjectFromPropertyDescriptor(exec, descriptor);
</span><span class="lines">@@ -261,19 +267,21 @@
</span><span class="cx">
</span><span class="cx"> JSValue objectConstructorGetOwnPropertyDescriptors(ExecState* exec, JSObject* object)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> PropertyNameArray properties(exec, PropertyNameMode::StringsAndSymbols);
</span><del>- object->methodTable(exec->vm())->getOwnPropertyNames(object, exec, properties, EnumerationMode(DontEnumPropertiesMode::Include));
- if (exec->hadException())
</del><ins>+ object->methodTable(vm)->getOwnPropertyNames(object, exec, properties, EnumerationMode(DontEnumPropertiesMode::Include));
+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> JSObject* descriptors = constructEmptyObject(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> for (auto& propertyName : properties) {
</span><span class="cx"> PropertyDescriptor descriptor;
</span><span class="cx"> bool didGetDescriptor = object->getOwnPropertyDescriptor(exec, propertyName, descriptor);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> if (!didGetDescriptor)
</span><span class="lines">@@ -285,7 +293,7 @@
</span><span class="cx">
</span><span class="cx"> PutPropertySlot slot(descriptors);
</span><span class="cx"> descriptors->putOwnDataPropertyMayBeIndex(exec, propertyName, fromDescriptor, slot);
</span><del>- ASSERT(!exec->hadException());
</del><ins>+ ASSERT(!scope.exception());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return descriptors;
</span><span class="lines">@@ -293,11 +301,13 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL objectConstructorGetOwnPropertyDescriptor(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSObject* object = exec->argument(0).toObject(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto propertyName = exec->argument(1).toPropertyKey(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> return JSValue::encode(objectConstructorGetOwnPropertyDescriptor(exec, object, propertyName));
</span><span class="cx"> }
</span><span class="lines">@@ -304,8 +314,10 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL objectConstructorGetOwnPropertyDescriptors(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSObject* object = exec->argument(0).toObject(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> return JSValue::encode(objectConstructorGetOwnPropertyDescriptors(exec, object));
</span><span class="cx"> }
</span><span class="lines">@@ -313,8 +325,10 @@
</span><span class="cx"> // FIXME: Use the enumeration cache.
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL objectConstructorGetOwnPropertyNames(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSObject* object = exec->argument(0).toObject(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsNull());
</span><span class="cx"> return JSValue::encode(ownPropertyKeys(exec, object, PropertyNameMode::Strings, DontEnumPropertiesMode::Include));
</span><span class="cx"> }
</span><span class="lines">@@ -322,8 +336,10 @@
</span><span class="cx"> // FIXME: Use the enumeration cache.
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL objectConstructorGetOwnPropertySymbols(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSObject* object = exec->argument(0).toObject(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsNull());
</span><span class="cx"> return JSValue::encode(ownPropertyKeys(exec, object, PropertyNameMode::Symbols, DontEnumPropertiesMode::Include));
</span><span class="cx"> }
</span><span class="lines">@@ -331,8 +347,10 @@
</span><span class="cx"> // FIXME: Use the enumeration cache.
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL objectConstructorKeys(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSObject* object = exec->argument(0).toObject(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsNull());
</span><span class="cx"> return JSValue::encode(ownPropertyKeys(exec, object, PropertyNameMode::Strings, DontEnumPropertiesMode::Exclude));
</span><span class="cx"> }
</span><span class="lines">@@ -339,8 +357,10 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL ownEnumerablePropertyKeys(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSObject* object = exec->argument(0).toObject(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsNull());
</span><span class="cx"> return JSValue::encode(ownPropertyKeys(exec, object, PropertyNameMode::StringsAndSymbols, DontEnumPropertiesMode::Exclude));
</span><span class="cx"> }
</span><span class="lines">@@ -360,40 +380,40 @@
</span><span class="cx">
</span><span class="cx"> if (description->hasProperty(exec, exec->propertyNames().enumerable)) {
</span><span class="cx"> JSValue value = description->get(exec, exec->propertyNames().enumerable);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> desc.setEnumerable(value.toBoolean(exec));
</span><del>- } else if (vm.exception())
</del><ins>+ } else if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (description->hasProperty(exec, exec->propertyNames().configurable)) {
</span><span class="cx"> JSValue value = description->get(exec, exec->propertyNames().configurable);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> desc.setConfigurable(value.toBoolean(exec));
</span><del>- } else if (vm.exception())
</del><ins>+ } else if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> JSValue value;
</span><span class="cx"> if (description->hasProperty(exec, exec->propertyNames().value)) {
</span><span class="cx"> JSValue value = description->get(exec, exec->propertyNames().value);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> desc.setValue(value);
</span><del>- } else if (vm.exception())
</del><ins>+ } else if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (description->hasProperty(exec, exec->propertyNames().writable)) {
</span><span class="cx"> JSValue value = description->get(exec, exec->propertyNames().writable);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> desc.setWritable(value.toBoolean(exec));
</span><del>- } else if (vm.exception())
</del><ins>+ } else if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (description->hasProperty(exec, exec->propertyNames().get)) {
</span><span class="cx"> JSValue get = description->get(exec, exec->propertyNames().get);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> if (!get.isUndefined()) {
</span><span class="cx"> CallData callData;
</span><span class="lines">@@ -403,12 +423,12 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> desc.setGetter(get);
</span><del>- } else if (vm.exception())
</del><ins>+ } else if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (description->hasProperty(exec, exec->propertyNames().set)) {
</span><span class="cx"> JSValue set = description->get(exec, exec->propertyNames().set);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> if (!set.isUndefined()) {
</span><span class="cx"> CallData callData;
</span><span class="lines">@@ -418,7 +438,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> desc.setSetter(set);
</span><del>- } else if (vm.exception())
</del><ins>+ } else if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (!desc.isAccessorDescriptor())
</span><span class="lines">@@ -445,7 +465,7 @@
</span><span class="cx"> return throwVMTypeError(exec, scope, ASCIILiteral("Properties can only be defined on Objects."));
</span><span class="cx"> JSObject* obj = asObject(exec->argument(0));
</span><span class="cx"> auto propertyName = exec->argument(1).toPropertyKey(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsNull());
</span><span class="cx"> PropertyDescriptor descriptor;
</span><span class="cx"> auto success = toPropertyDescriptor(exec, exec->argument(2), descriptor);
</span><span class="lines">@@ -453,7 +473,7 @@
</span><span class="cx"> if (!success)
</span><span class="cx"> return JSValue::encode(jsNull());
</span><span class="cx"> ASSERT((descriptor.attributes() & Accessor) || (!descriptor.isAccessorDescriptor()));
</span><del>- ASSERT(!exec->hadException());
</del><ins>+ ASSERT(!scope.exception());
</ins><span class="cx"> obj->methodTable(vm)->defineOwnProperty(obj, exec, propertyName, descriptor, true);
</span><span class="cx"> scope.release();
</span><span class="cx"> return JSValue::encode(obj);
</span><span class="lines">@@ -461,9 +481,12 @@
</span><span class="cx">
</span><span class="cx"> static JSValue defineProperties(ExecState* exec, JSObject* object, JSObject* properties)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> PropertyNameArray propertyNames(exec, PropertyNameMode::StringsAndSymbols);
</span><del>- asObject(properties)->methodTable(exec->vm())->getOwnPropertyNames(asObject(properties), exec, propertyNames, EnumerationMode(DontEnumPropertiesMode::Exclude));
- if (UNLIKELY(exec->hadException()))
</del><ins>+ asObject(properties)->methodTable(vm)->getOwnPropertyNames(asObject(properties), exec, propertyNames, EnumerationMode(DontEnumPropertiesMode::Exclude));
+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsNull();
</span><span class="cx"> size_t numProperties = propertyNames.size();
</span><span class="cx"> Vector<PropertyDescriptor> descriptors;
</span><span class="lines">@@ -470,7 +493,7 @@
</span><span class="cx"> MarkedArgumentBuffer markBuffer;
</span><span class="cx"> for (size_t i = 0; i < numProperties; i++) {
</span><span class="cx"> JSValue prop = properties->get(exec, propertyNames[i]);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsNull();
</span><span class="cx"> PropertyDescriptor descriptor;
</span><span class="cx"> if (!toPropertyDescriptor(exec, prop, descriptor))
</span><span class="lines">@@ -490,8 +513,8 @@
</span><span class="cx"> Identifier propertyName = propertyNames[i];
</span><span class="cx"> if (exec->propertyNames().isPrivateName(propertyName))
</span><span class="cx"> continue;
</span><del>- object->methodTable(exec->vm())->defineOwnProperty(object, exec, propertyName, descriptors[i], true);
- if (exec->hadException())
</del><ins>+ object->methodTable(vm)->defineOwnProperty(object, exec, propertyName, descriptors[i], true);
+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsNull();
</span><span class="cx"> }
</span><span class="cx"> return object;
</span><span class="lines">@@ -531,6 +554,9 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL objectConstructorSeal(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> // 1. If Type(O) is not Object, return O.
</span><span class="cx"> JSValue obj = exec->argument(0);
</span><span class="cx"> if (!obj.isObject())
</span><span class="lines">@@ -538,14 +564,14 @@
</span><span class="cx"> JSObject* object = asObject(obj);
</span><span class="cx">
</span><span class="cx"> if (isJSFinalObject(object)) {
</span><del>- object->seal(exec->vm());
</del><ins>+ object->seal(vm);
</ins><span class="cx"> return JSValue::encode(obj);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // 2. For each named own property name P of O,
</span><span class="cx"> PropertyNameArray properties(exec, PropertyNameMode::StringsAndSymbols);
</span><del>- object->methodTable(exec->vm())->getOwnPropertyNames(object, exec, properties, EnumerationMode(DontEnumPropertiesMode::Include));
- if (UNLIKELY(exec->hadException()))
</del><ins>+ object->methodTable(vm)->getOwnPropertyNames(object, exec, properties, EnumerationMode(DontEnumPropertiesMode::Include));
+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(obj);
</span><span class="cx"> PropertyNameArray::const_iterator end = properties.end();
</span><span class="cx"> for (PropertyNameArray::const_iterator iter = properties.begin(); iter != end; ++iter) {
</span><span class="lines">@@ -559,14 +585,14 @@
</span><span class="cx"> // b. If desc.[[Configurable]] is true, set desc.[[Configurable]] to false.
</span><span class="cx"> desc.setConfigurable(false);
</span><span class="cx"> // c. Call the [[DefineOwnProperty]] internal method of O with P, desc, and true as arguments.
</span><del>- object->methodTable(exec->vm())->defineOwnProperty(object, exec, propertyName, desc, true);
- if (exec->hadException())
</del><ins>+ object->methodTable(vm)->defineOwnProperty(object, exec, propertyName, desc, true);
+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(obj);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // 3. Set the [[Extensible]] internal property of O to false.
</span><del>- object->methodTable(exec->vm())->preventExtensions(object, exec);
- if (exec->hadException())
</del><ins>+ object->methodTable(vm)->preventExtensions(object, exec);
+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx">
</span><span class="cx"> // 4. Return O.
</span><span class="lines">@@ -575,15 +601,18 @@
</span><span class="cx">
</span><span class="cx"> JSObject* objectConstructorFreeze(ExecState* exec, JSObject* object)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> if (isJSFinalObject(object) && !hasIndexedProperties(object->indexingType())) {
</span><del>- object->freeze(exec->vm());
</del><ins>+ object->freeze(vm);
</ins><span class="cx"> return object;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // 2. For each named own property name P of O,
</span><span class="cx"> PropertyNameArray properties(exec, PropertyNameMode::StringsAndSymbols);
</span><del>- object->methodTable(exec->vm())->getOwnPropertyNames(object, exec, properties, EnumerationMode(DontEnumPropertiesMode::Include));
- if (UNLIKELY(exec->hadException()))
</del><ins>+ object->methodTable(vm)->getOwnPropertyNames(object, exec, properties, EnumerationMode(DontEnumPropertiesMode::Include));
+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return object;
</span><span class="cx"> PropertyNameArray::const_iterator end = properties.end();
</span><span class="cx"> for (PropertyNameArray::const_iterator iter = properties.begin(); iter != end; ++iter) {
</span><span class="lines">@@ -601,14 +630,14 @@
</span><span class="cx"> // c. If desc.[[Configurable]] is true, set desc.[[Configurable]] to false.
</span><span class="cx"> desc.setConfigurable(false);
</span><span class="cx"> // d. Call the [[DefineOwnProperty]] internal method of O with P, desc, and true as arguments.
</span><del>- object->methodTable(exec->vm())->defineOwnProperty(object, exec, propertyName, desc, true);
- if (exec->hadException())
</del><ins>+ object->methodTable(vm)->defineOwnProperty(object, exec, propertyName, desc, true);
+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return object;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // 3. Set the [[Extensible]] internal property of O to false.
</span><del>- object->methodTable(exec->vm())->preventExtensions(object, exec);
- if (exec->hadException())
</del><ins>+ object->methodTable(vm)->preventExtensions(object, exec);
+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> // 4. Return O.
</span><span class="lines">@@ -617,12 +646,14 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL objectConstructorFreeze(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> // 1. If Type(O) is not Object, return O.
</span><span class="cx"> JSValue obj = exec->argument(0);
</span><span class="cx"> if (!obj.isObject())
</span><span class="cx"> return JSValue::encode(obj);
</span><span class="cx"> JSObject* result = objectConstructorFreeze(exec, asObject(obj));
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> return JSValue::encode(result);
</span><span class="cx"> }
</span><span class="lines">@@ -639,6 +670,9 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL objectConstructorIsSealed(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> // 1. If Type(O) is not Object, return true.
</span><span class="cx"> JSValue obj = exec->argument(0);
</span><span class="cx"> if (!obj.isObject())
</span><span class="lines">@@ -646,12 +680,12 @@
</span><span class="cx"> JSObject* object = asObject(obj);
</span><span class="cx">
</span><span class="cx"> if (isJSFinalObject(object))
</span><del>- return JSValue::encode(jsBoolean(object->isSealed(exec->vm())));
</del><ins>+ return JSValue::encode(jsBoolean(object->isSealed(vm)));
</ins><span class="cx">
</span><span class="cx"> // 2. For each named own property name P of O,
</span><span class="cx"> PropertyNameArray properties(exec, PropertyNameMode::StringsAndSymbols);
</span><del>- object->methodTable(exec->vm())->getOwnPropertyNames(object, exec, properties, EnumerationMode(DontEnumPropertiesMode::Include));
- if (UNLIKELY(exec->hadException()))
</del><ins>+ object->methodTable(vm)->getOwnPropertyNames(object, exec, properties, EnumerationMode(DontEnumPropertiesMode::Include));
+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> PropertyNameArray::const_iterator end = properties.end();
</span><span class="cx"> for (PropertyNameArray::const_iterator iter = properties.begin(); iter != end; ++iter) {
</span><span class="lines">@@ -670,7 +704,7 @@
</span><span class="cx"> // 3. If the [[Extensible]] internal property of O is false, then return true.
</span><span class="cx"> // 4. Otherwise, return false.
</span><span class="cx"> bool isExtensible = object->isExtensible(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> return JSValue::encode(jsBoolean(!isExtensible));
</span><span class="cx"> }
</span><span class="lines">@@ -677,6 +711,9 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL objectConstructorIsFrozen(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> // 1. If Type(O) is not Object, return true.
</span><span class="cx"> JSValue obj = exec->argument(0);
</span><span class="cx"> if (!obj.isObject())
</span><span class="lines">@@ -684,12 +721,12 @@
</span><span class="cx"> JSObject* object = asObject(obj);
</span><span class="cx">
</span><span class="cx"> if (isJSFinalObject(object))
</span><del>- return JSValue::encode(jsBoolean(object->isFrozen(exec->vm())));
</del><ins>+ return JSValue::encode(jsBoolean(object->isFrozen(vm)));
</ins><span class="cx">
</span><span class="cx"> // 2. For each named own property name P of O,
</span><span class="cx"> PropertyNameArray properties(exec, PropertyNameMode::StringsAndSymbols);
</span><del>- object->methodTable(exec->vm())->getOwnPropertyNames(object, exec, properties, EnumerationMode(DontEnumPropertiesMode::Include));
- if (UNLIKELY(exec->hadException()))
</del><ins>+ object->methodTable(vm)->getOwnPropertyNames(object, exec, properties, EnumerationMode(DontEnumPropertiesMode::Include));
+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> PropertyNameArray::const_iterator end = properties.end();
</span><span class="cx"> for (PropertyNameArray::const_iterator iter = properties.begin(); iter != end; ++iter) {
</span><span class="lines">@@ -709,7 +746,7 @@
</span><span class="cx"> // 3. If the [[Extensible]] internal property of O is false, then return true.
</span><span class="cx"> // 4. Otherwise, return false.
</span><span class="cx"> bool isExtensible = object->isExtensible(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> return JSValue::encode(jsBoolean(!isExtensible));
</span><span class="cx"> }
</span><span class="lines">@@ -716,12 +753,14 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL objectConstructorIsExtensible(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSValue obj = exec->argument(0);
</span><span class="cx"> if (!obj.isObject())
</span><span class="cx"> return JSValue::encode(jsBoolean(false));
</span><span class="cx"> JSObject* object = asObject(obj);
</span><span class="cx"> bool isExtensible = object->isExtensible(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> return JSValue::encode(jsBoolean(isExtensible));
</span><span class="cx"> }
</span><span class="lines">@@ -735,13 +774,14 @@
</span><span class="cx"> JSArray* ownPropertyKeys(ExecState* exec, JSObject* object, PropertyNameMode propertyNameMode, DontEnumPropertiesMode dontEnumPropertiesMode)
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> PropertyNameArray properties(exec, propertyNameMode);
</span><span class="cx"> object->methodTable(vm)->getOwnPropertyNames(object, exec, properties, EnumerationMode(dontEnumPropertiesMode));
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> JSArray* keys = constructEmptyArray(exec, 0);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> switch (propertyNameMode) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeObjectConstructorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ObjectConstructor.h (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ObjectConstructor.h 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/ObjectConstructor.h 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -101,8 +101,9 @@
</span><span class="cx"> inline JSObject* constructObjectFromPropertyDescriptor(ExecState* exec, const PropertyDescriptor& descriptor)
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSObject* description = constructEmptyObject(exec);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> if (!descriptor.isAccessorDescriptor()) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeObjectPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ObjectPrototype.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ObjectPrototype.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/ObjectPrototype.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -89,9 +89,12 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL objectProtoFuncHasOwnProperty(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> JSValue thisValue = exec->thisValue().toThis(exec, StrictMode);
</span><span class="cx"> auto propertyName = exec->argument(0).toPropertyKey(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> JSObject* thisObject = thisValue.toObject(exec);
</span><span class="cx"> if (!thisObject)
</span><span class="lines">@@ -101,6 +104,9 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL objectProtoFuncIsPrototypeOf(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> JSValue thisValue = exec->thisValue().toThis(exec, StrictMode);
</span><span class="cx"> JSObject* thisObj = thisValue.toObject(exec);
</span><span class="cx"> if (!thisObj)
</span><span class="lines">@@ -109,9 +115,8 @@
</span><span class="cx"> if (!exec->argument(0).isObject())
</span><span class="cx"> return JSValue::encode(jsBoolean(false));
</span><span class="cx">
</span><del>- VM& vm = exec->vm();
</del><span class="cx"> JSValue v = asObject(exec->argument(0))->getPrototype(vm, exec);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx">
</span><span class="cx"> while (true) {
</span><span class="lines">@@ -120,7 +125,7 @@
</span><span class="cx"> if (v == thisObj)
</span><span class="cx"> return JSValue::encode(jsBoolean(true));
</span><span class="cx"> v = asObject(v)->getPrototype(vm, exec);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -131,7 +136,7 @@
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> JSObject* thisObject = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> JSValue get = exec->argument(1);
</span><span class="lines">@@ -140,7 +145,7 @@
</span><span class="cx"> return throwVMTypeError(exec, scope, ASCIILiteral("invalid getter usage"));
</span><span class="cx">
</span><span class="cx"> auto propertyName = exec->argument(0).toPropertyKey(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> PropertyDescriptor descriptor;
</span><span class="lines">@@ -160,7 +165,7 @@
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> JSObject* thisObject = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> JSValue set = exec->argument(1);
</span><span class="lines">@@ -169,7 +174,7 @@
</span><span class="cx"> return throwVMTypeError(exec, scope, ASCIILiteral("invalid setter usage"));
</span><span class="cx">
</span><span class="cx"> auto propertyName = exec->argument(0).toPropertyKey(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> PropertyDescriptor descriptor;
</span><span class="lines">@@ -185,12 +190,15 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL objectProtoFuncLookupGetter(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> JSObject* thisObject = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> auto propertyName = exec->argument(0).toPropertyKey(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> PropertySlot slot(thisObject, PropertySlot::InternalMethodType::GetOwnProperty);
</span><span class="lines">@@ -212,12 +220,15 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL objectProtoFuncLookupSetter(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> JSObject* thisObject = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> auto propertyName = exec->argument(0).toPropertyKey(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> PropertySlot slot(thisObject, PropertySlot::InternalMethodType::GetOwnProperty);
</span><span class="lines">@@ -239,12 +250,15 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL objectProtoFuncPropertyIsEnumerable(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> auto propertyName = exec->argument(0).toPropertyKey(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> JSObject* thisObject = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> PropertyDescriptor descriptor;
</span><span class="cx"> bool enumerable = thisObject->getOwnPropertyDescriptor(exec, propertyName, descriptor) && descriptor.enumerable();
</span><span class="lines">@@ -254,9 +268,12 @@
</span><span class="cx"> // 15.2.4.3 Object.prototype.toLocaleString()
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL objectProtoFuncToLocaleString(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> // 1. Let O be the result of calling ToObject passing the this value as the argument.
</span><span class="cx"> JSObject* object = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> // 2. Let toString be the result of calling the [[Get]] internal method of O passing "toString" as the argument.
</span><span class="lines">@@ -292,7 +309,7 @@
</span><span class="cx"> return JSValue::encode(thisObject->getPropertySlot(exec, toStringTagSymbol, [&] (bool found, PropertySlot& toStringTagSlot) -> JSValue {
</span><span class="cx"> if (found) {
</span><span class="cx"> JSValue stringTag = toStringTagSlot.getValue(exec, toStringTagSymbol);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> if (stringTag.isString()) {
</span><span class="cx"> JSRopeString::RopeBuilder ropeBuilder(vm);
</span><span class="lines">@@ -307,7 +324,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String tag = thisObject->methodTable(exec->vm())->toStringName(thisObject, exec);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue();
</span><span class="cx"> String newString = WTF::tryMakeString("[object ", WTFMove(tag), "]");
</span><span class="cx"> if (!newString)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeOperationscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Operations.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Operations.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/Operations.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 1999-2000 Harri Porten (porten@kde.org)
</span><del>- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
</del><ins>+ * Copyright (C) 2008, 2016 Apple Inc. All Rights Reserved.
</ins><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="cx"> * modify it under the terms of the GNU Library General Public
</span><span class="lines">@@ -44,11 +44,12 @@
</span><span class="cx"> {
</span><span class="cx"> // exception for the Date exception in defaultValue()
</span><span class="cx"> VM& vm = callFrame->vm();
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSValue p1 = v1.toPrimitive(callFrame);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue();
</span><span class="cx"> JSValue p2 = v2.toPrimitive(callFrame);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue();
</span><span class="cx">
</span><span class="cx"> if (p1.isString())
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeOptionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Options.h (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Options.h 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/Options.h 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -346,6 +346,7 @@
</span><span class="cx"> v(bool, useExceptionFuzz, false, Normal, nullptr) \
</span><span class="cx"> v(unsigned, fireExceptionFuzzAt, 0, Normal, nullptr) \
</span><span class="cx"> v(bool, validateDFGExceptionHandling, false, Normal, "Causes the DFG to emit code validating exception handling for each node that can exit") /* This is true by default on Debug builds */\
</span><ins>+ v(bool, dumpSimulatedThrows, false, Normal, "Dumps the call stack at each simulated throw for exception scope verification") \
</ins><span class="cx"> \
</span><span class="cx"> v(bool, useExecutableAllocationFuzz, false, Normal, nullptr) \
</span><span class="cx"> v(unsigned, fireExecutableAllocationFuzzAt, 0, Normal, nullptr) \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimePropertyDescriptorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/PropertyDescriptor.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/PropertyDescriptor.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/PropertyDescriptor.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -75,9 +75,11 @@
</span><span class="cx"> GetterSetter* PropertyDescriptor::slowGetterSetter(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> JSGlobalObject* globalObject = exec->lexicalGlobalObject();
</span><span class="cx"> GetterSetter* getterSetter = GetterSetter::create(vm, globalObject);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> if (m_getter && !m_getter.isUndefined())
</span><span class="cx"> getterSetter->setGetter(vm, globalObject, jsCast<JSObject*>(m_getter));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeProxyConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ProxyConstructor.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ProxyConstructor.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/ProxyConstructor.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -55,23 +55,23 @@
</span><span class="cx">
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL makeRevocableProxy(ExecState* exec)
</span><span class="cx"> {
</span><del>- auto scope = DECLARE_THROW_SCOPE(exec->vm());
</del><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> if (exec->argumentCount() < 2)
</span><span class="cx"> return throwVMTypeError(exec, scope, ASCIILiteral("Proxy.revocable needs to be called with two arguments: the target and the handler"));
</span><span class="cx">
</span><del>- VM& vm = exec->vm();
</del><span class="cx"> ArgList args(exec);
</span><span class="cx"> JSValue target = args.at(0);
</span><span class="cx"> JSValue handler = args.at(1);
</span><span class="cx"> ProxyObject* proxy = ProxyObject::create(exec, exec->lexicalGlobalObject(), target, handler);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> ProxyRevoke* revoke = ProxyRevoke::create(vm, exec->lexicalGlobalObject()->proxyRevokeStructure(), proxy);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx">
</span><span class="cx"> JSObject* result = constructEmptyObject(exec);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> result->putDirect(vm, makeIdentifier(vm, "proxy"), proxy, None);
</span><span class="cx"> result->putDirect(vm, makeIdentifier(vm, "revoke"), revoke, None);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeProxyObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -53,12 +53,13 @@
</span><span class="cx"> String ProxyObject::toStringName(const JSObject* object, ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> const ProxyObject* proxy = jsCast<const ProxyObject*>(object);
</span><span class="cx"> while (proxy) {
</span><span class="cx"> const JSObject* target = proxy->target();
</span><span class="cx"> if (isArray(exec, target))
</span><span class="cx"> return target->classInfo()->methodTable.toStringName(target, exec);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> proxy = jsDynamicCast<const ProxyObject*>(target);
</span><span class="lines">@@ -140,7 +141,7 @@
</span><span class="cx"> CallData callData;
</span><span class="cx"> CallType callType;
</span><span class="cx"> JSValue getHandler = handler->getMethod(exec, callData, callType, vm.propertyNames->get, ASCIILiteral("'get' property of a Proxy's handler object should be callable"));
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> if (getHandler.isUndefined())
</span><span class="lines">@@ -151,7 +152,7 @@
</span><span class="cx"> arguments.append(identifierToSafePublicJSValue(vm, Identifier::fromUid(&vm, propertyName.uid())));
</span><span class="cx"> arguments.append(receiver);
</span><span class="cx"> JSValue trapResult = call(exec, getHandler, callType, callData, handler, arguments);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> PropertyDescriptor descriptor;
</span><span class="lines">@@ -165,7 +166,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> return trapResult;
</span><span class="lines">@@ -173,8 +174,10 @@
</span><span class="cx">
</span><span class="cx"> bool ProxyObject::performGet(ExecState* exec, PropertyName propertyName, PropertySlot& slot)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSValue result = performProxyGet(exec, this, slot.thisValue(), propertyName);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> unsigned ignoredAttributes = 0;
</span><span class="cx"> slot.setValue(this, ignoredAttributes, result);
</span><span class="lines">@@ -208,7 +211,7 @@
</span><span class="cx"> CallData callData;
</span><span class="cx"> CallType callType;
</span><span class="cx"> JSValue getOwnPropertyDescriptorMethod = handler->getMethod(exec, callData, callType, makeIdentifier(vm, "getOwnPropertyDescriptor"), ASCIILiteral("'getOwnPropertyDescriptor' property of a Proxy's handler should be callable"));
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> if (getOwnPropertyDescriptorMethod.isUndefined())
</span><span class="cx"> return performDefaultGetOwnProperty();
</span><span class="lines">@@ -217,7 +220,7 @@
</span><span class="cx"> arguments.append(target);
</span><span class="cx"> arguments.append(identifierToSafePublicJSValue(vm, Identifier::fromUid(&vm, propertyName.uid())));
</span><span class="cx"> JSValue trapResult = call(exec, getOwnPropertyDescriptorMethod, callType, callData, handler, arguments);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (!trapResult.isUndefined() && !trapResult.isObject()) {
</span><span class="lines">@@ -227,7 +230,7 @@
</span><span class="cx">
</span><span class="cx"> PropertyDescriptor targetPropertyDescriptor;
</span><span class="cx"> bool isTargetPropertyDescriptorDefined = target->getOwnPropertyDescriptor(exec, propertyName, targetPropertyDescriptor);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (trapResult.isUndefined()) {
</span><span class="lines">@@ -240,7 +243,7 @@
</span><span class="cx"> // FIXME: this doesn't work if 'target' is another Proxy. We don't have isExtensible implemented in a way that fits w/ Proxys.
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=154375
</span><span class="cx"> bool isExtensible = target->isExtensible(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> if (!isExtensible) {
</span><span class="cx"> // FIXME: Come up with a test for this error. I'm not sure how to because
</span><span class="lines">@@ -254,11 +257,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool isExtensible = target->isExtensible(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> PropertyDescriptor trapResultAsDescriptor;
</span><span class="cx"> toPropertyDescriptor(exec, trapResult, trapResultAsDescriptor);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> bool throwException = false;
</span><span class="cx"> bool valid = validateAndApplyPropertyDescriptor(exec, nullptr, propertyName, isExtensible,
</span><span class="lines">@@ -277,7 +280,7 @@
</span><span class="cx">
</span><span class="cx"> if (trapResultAsDescriptor.isAccessorDescriptor()) {
</span><span class="cx"> GetterSetter* getterSetter = trapResultAsDescriptor.slowGetterSetter(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> slot.setGetterSlot(this, trapResultAsDescriptor.attributes(), getterSetter);
</span><span class="cx"> } else if (trapResultAsDescriptor.isDataDescriptor() && !trapResultAsDescriptor.value().isEmpty())
</span><span class="lines">@@ -316,7 +319,7 @@
</span><span class="cx"> CallData callData;
</span><span class="cx"> CallType callType;
</span><span class="cx"> JSValue hasMethod = handler->getMethod(exec, callData, callType, vm.propertyNames->has, ASCIILiteral("'has' property of a Proxy's handler should be callable"));
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> if (hasMethod.isUndefined())
</span><span class="cx"> return performDefaultHasProperty();
</span><span class="lines">@@ -325,17 +328,17 @@
</span><span class="cx"> arguments.append(target);
</span><span class="cx"> arguments.append(identifierToSafePublicJSValue(vm, Identifier::fromUid(&vm, propertyName.uid())));
</span><span class="cx"> JSValue trapResult = call(exec, hasMethod, callType, callData, handler, arguments);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> bool trapResultAsBool = trapResult.toBoolean(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (!trapResultAsBool) {
</span><span class="cx"> PropertyDescriptor descriptor;
</span><span class="cx"> bool isPropertyDescriptorDefined = target->getOwnPropertyDescriptor(exec, propertyName, descriptor);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> if (isPropertyDescriptorDefined) {
</span><span class="cx"> if (!descriptor.configurable()) {
</span><span class="lines">@@ -343,7 +346,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> bool isExtensible = target->isExtensible(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> if (!isExtensible) {
</span><span class="cx"> throwVMTypeError(exec, scope, ASCIILiteral("Proxy 'has' must return 'true' for a non-extensible 'target' object with a configurable property"));
</span><span class="lines">@@ -416,7 +419,7 @@
</span><span class="cx"> CallData callData;
</span><span class="cx"> CallType callType;
</span><span class="cx"> JSValue setMethod = handler->getMethod(exec, callData, callType, vm.propertyNames->set, ASCIILiteral("'set' property of a Proxy's handler should be callable"));
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> JSObject* target = this->target();
</span><span class="cx"> if (setMethod.isUndefined())
</span><span class="lines">@@ -428,10 +431,10 @@
</span><span class="cx"> arguments.append(putValue);
</span><span class="cx"> arguments.append(thisValue);
</span><span class="cx"> JSValue trapResult = call(exec, setMethod, callType, callData, handler, arguments);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> bool trapResultAsBool = trapResult.toBoolean(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> if (!trapResultAsBool)
</span><span class="cx"> return false;
</span><span class="lines">@@ -467,8 +470,9 @@
</span><span class="cx"> bool ProxyObject::putByIndexCommon(ExecState* exec, JSValue thisValue, unsigned propertyName, JSValue putValue, bool shouldThrow)
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><del>- Identifier ident = Identifier::from(exec, propertyName);
- if (exec->hadException())
</del><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
+ Identifier ident = Identifier::from(exec, propertyName);
+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> auto performDefaultPut = [&] () {
</span><span class="cx"> JSObject* target = this->target();
</span><span class="lines">@@ -502,7 +506,7 @@
</span><span class="cx"> CallData callData;
</span><span class="cx"> CallType callType;
</span><span class="cx"> JSValue applyMethod = handler->getMethod(exec, callData, callType, makeIdentifier(vm, "apply"), ASCIILiteral("'apply' property of a Proxy's handler should be callable"));
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> JSObject* target = proxy->target();
</span><span class="cx"> if (applyMethod.isUndefined()) {
</span><span class="lines">@@ -513,7 +517,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSArray* argArray = constructArray(exec, static_cast<ArrayAllocationProfile*>(nullptr), ArgList(exec));
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> MarkedArgumentBuffer arguments;
</span><span class="cx"> arguments.append(target);
</span><span class="lines">@@ -552,7 +556,7 @@
</span><span class="cx"> CallData callData;
</span><span class="cx"> CallType callType;
</span><span class="cx"> JSValue constructMethod = handler->getMethod(exec, callData, callType, makeIdentifier(vm, "construct"), ASCIILiteral("'construct' property of a Proxy's handler should be constructible"));
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> JSObject* target = proxy->target();
</span><span class="cx"> if (constructMethod.isUndefined()) {
</span><span class="lines">@@ -563,7 +567,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSArray* argArray = constructArray(exec, static_cast<ArrayAllocationProfile*>(nullptr), ArgList(exec));
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> MarkedArgumentBuffer arguments;
</span><span class="cx"> arguments.append(target);
</span><span class="lines">@@ -570,7 +574,7 @@
</span><span class="cx"> arguments.append(argArray);
</span><span class="cx"> arguments.append(exec->newTarget());
</span><span class="cx"> JSValue result = call(exec, constructMethod, callType, callData, handler, arguments);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> if (!result.isObject())
</span><span class="cx"> return throwVMTypeError(exec, scope, ASCIILiteral("Result from Proxy handler's 'construct' method should be an object"));
</span><span class="lines">@@ -613,7 +617,7 @@
</span><span class="cx"> CallData callData;
</span><span class="cx"> CallType callType;
</span><span class="cx"> JSValue deletePropertyMethod = handler->getMethod(exec, callData, callType, makeIdentifier(vm, "deleteProperty"), ASCIILiteral("'deleteProperty' property of a Proxy's handler should be callable"));
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> JSObject* target = this->target();
</span><span class="cx"> if (deletePropertyMethod.isUndefined())
</span><span class="lines">@@ -623,11 +627,11 @@
</span><span class="cx"> arguments.append(target);
</span><span class="cx"> arguments.append(identifierToSafePublicJSValue(vm, Identifier::fromUid(&vm, propertyName.uid())));
</span><span class="cx"> JSValue trapResult = call(exec, deletePropertyMethod, callType, callData, handler, arguments);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> bool trapResultAsBool = trapResult.toBoolean(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (!trapResultAsBool)
</span><span class="lines">@@ -641,7 +645,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="lines">@@ -687,7 +691,7 @@
</span><span class="cx"> CallData callData;
</span><span class="cx"> CallType callType;
</span><span class="cx"> JSValue preventExtensionsMethod = handler->getMethod(exec, callData, callType, makeIdentifier(vm, "preventExtensions"), ASCIILiteral("'preventExtensions' property of a Proxy's handler should be callable"));
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> JSObject* target = this->target();
</span><span class="cx"> if (preventExtensionsMethod.isUndefined())
</span><span class="lines">@@ -696,16 +700,16 @@
</span><span class="cx"> MarkedArgumentBuffer arguments;
</span><span class="cx"> arguments.append(target);
</span><span class="cx"> JSValue trapResult = call(exec, preventExtensionsMethod, callType, callData, handler, arguments);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> bool trapResultAsBool = trapResult.toBoolean(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (trapResultAsBool) {
</span><span class="cx"> bool targetIsExtensible = target->isExtensible(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> if (targetIsExtensible) {
</span><span class="cx"> throwVMTypeError(exec, scope, ASCIILiteral("Proxy's 'preventExtensions' trap returned true even though its target is extensible. It should have returned false"));
</span><span class="lines">@@ -740,7 +744,7 @@
</span><span class="cx"> CallData callData;
</span><span class="cx"> CallType callType;
</span><span class="cx"> JSValue isExtensibleMethod = handler->getMethod(exec, callData, callType, makeIdentifier(vm, "isExtensible"), ASCIILiteral("'isExtensible' property of a Proxy's handler should be callable"));
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> JSObject* target = this->target();
</span><span class="lines">@@ -750,15 +754,15 @@
</span><span class="cx"> MarkedArgumentBuffer arguments;
</span><span class="cx"> arguments.append(target);
</span><span class="cx"> JSValue trapResult = call(exec, isExtensibleMethod, callType, callData, handler, arguments);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> bool trapResultAsBool = trapResult.toBoolean(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> bool isTargetExtensible = target->isExtensible(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (trapResultAsBool != isTargetExtensible) {
</span><span class="lines">@@ -807,7 +811,7 @@
</span><span class="cx"> CallData callData;
</span><span class="cx"> CallType callType;
</span><span class="cx"> JSValue definePropertyMethod = handler->getMethod(exec, callData, callType, vm.propertyNames->defineProperty, ASCIILiteral("'defineProperty' property of a Proxy's handler should be callable"));
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (definePropertyMethod.isUndefined())
</span><span class="lines">@@ -814,7 +818,7 @@
</span><span class="cx"> return performDefaultDefineOwnProperty();
</span><span class="cx">
</span><span class="cx"> JSObject* descriptorObject = constructObjectFromPropertyDescriptor(exec, descriptor);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> MarkedArgumentBuffer arguments;
</span><span class="lines">@@ -822,11 +826,11 @@
</span><span class="cx"> arguments.append(identifierToSafePublicJSValue(vm, Identifier::fromUid(&vm, propertyName.uid())));
</span><span class="cx"> arguments.append(descriptorObject);
</span><span class="cx"> JSValue trapResult = call(exec, definePropertyMethod, callType, callData, handler, arguments);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> bool trapResultAsBool = trapResult.toBoolean(exec);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (!trapResultAsBool)
</span><span class="lines">@@ -834,11 +838,11 @@
</span><span class="cx">
</span><span class="cx"> PropertyDescriptor targetDescriptor;
</span><span class="cx"> bool isTargetDescriptorDefined = target->getOwnPropertyDescriptor(exec, propertyName, targetDescriptor);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> bool targetIsExtensible = target->isExtensible(exec);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> bool settingConfigurableToFalse = descriptor.configurablePresent() && !descriptor.configurable();
</span><span class="cx">
</span><span class="lines">@@ -896,7 +900,7 @@
</span><span class="cx"> CallData callData;
</span><span class="cx"> CallType callType;
</span><span class="cx"> JSValue ownKeysMethod = handler->getMethod(exec, callData, callType, makeIdentifier(vm, "ownKeys"), ASCIILiteral("'ownKeys' property of a Proxy's handler should be callable"));
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> JSObject* target = this->target();
</span><span class="cx"> if (ownKeysMethod.isUndefined()) {
</span><span class="lines">@@ -907,7 +911,7 @@
</span><span class="cx"> MarkedArgumentBuffer arguments;
</span><span class="cx"> arguments.append(target);
</span><span class="cx"> JSValue arrayLikeObject = call(exec, ownKeysMethod, callType, callData, handler, arguments);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> PropertyNameMode propertyNameMode = trapResult.mode();
</span><span class="lines">@@ -935,7 +939,7 @@
</span><span class="cx"> return dontExitEarly;
</span><span class="cx">
</span><span class="cx"> Identifier ident = value.toPropertyKey(exec);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return doExitEarly;
</span><span class="cx">
</span><span class="cx"> uncheckedResultKeys.add(ident.impl());
</span><span class="lines">@@ -944,7 +948,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> createListFromArrayLike(exec, arrayLikeObject, dontThrowAnExceptionTypeFilter, ASCIILiteral("Proxy handler's 'ownKeys' method must return an array-like object containing only Strings and Symbols"), addPropName);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> bool targetIsExensible = target->isExtensible(exec);
</span><span class="lines">@@ -951,7 +955,7 @@
</span><span class="cx">
</span><span class="cx"> PropertyNameArray targetKeys(&vm, propertyNameMode);
</span><span class="cx"> target->methodTable(vm)->getOwnPropertyNames(target, exec, targetKeys, enumerationMode);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> Vector<UniquedStringImpl*> targetConfigurableKeys;
</span><span class="cx"> Vector<UniquedStringImpl*> targetNonConfigurableKeys;
</span><span class="lines">@@ -958,7 +962,7 @@
</span><span class="cx"> for (const Identifier& ident : targetKeys) {
</span><span class="cx"> PropertyDescriptor descriptor;
</span><span class="cx"> bool isPropertyDefined = target->getOwnPropertyDescriptor(exec, ident.impl(), descriptor);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> if (isPropertyDefined && !descriptor.configurable())
</span><span class="cx"> targetNonConfigurableKeys.append(ident.impl());
</span><span class="lines">@@ -1047,7 +1051,7 @@
</span><span class="cx"> CallData callData;
</span><span class="cx"> CallType callType;
</span><span class="cx"> JSValue setPrototypeOfMethod = handler->getMethod(exec, callData, callType, makeIdentifier(vm, "setPrototypeOf"), ASCIILiteral("'setPrototypeOf' property of a Proxy's handler should be callable"));
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> JSObject* target = this->target();
</span><span class="lines">@@ -1058,11 +1062,11 @@
</span><span class="cx"> arguments.append(target);
</span><span class="cx"> arguments.append(prototype);
</span><span class="cx"> JSValue trapResult = call(exec, setPrototypeOfMethod, callType, callData, handler, arguments);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> bool trapResultAsBool = trapResult.toBoolean(exec);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (!trapResultAsBool) {
</span><span class="lines">@@ -1072,13 +1076,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool targetIsExtensible = target->isExtensible(exec);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> if (targetIsExtensible)
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> JSValue targetPrototype = target->getPrototype(vm, exec);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> if (!sameValue(exec, prototype, targetPrototype)) {
</span><span class="cx"> throwVMTypeError(exec, scope, ASCIILiteral("Proxy 'setPrototypeOf' trap returned true when its target is non-extensible and the new prototype value is not the same as the current prototype value. It should have returned false"));
</span><span class="lines">@@ -1112,7 +1116,7 @@
</span><span class="cx"> CallData callData;
</span><span class="cx"> CallType callType;
</span><span class="cx"> JSValue getPrototypeOfMethod = handler->getMethod(exec, callData, callType, makeIdentifier(vm, "getPrototypeOf"), ASCIILiteral("'getPrototypeOf' property of a Proxy's handler should be callable"));
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue();
</span><span class="cx">
</span><span class="cx"> JSObject* target = this->target();
</span><span class="lines">@@ -1122,7 +1126,7 @@
</span><span class="cx"> MarkedArgumentBuffer arguments;
</span><span class="cx"> arguments.append(target);
</span><span class="cx"> JSValue trapResult = call(exec, getPrototypeOfMethod, callType, callData, handler, arguments);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue();
</span><span class="cx">
</span><span class="cx"> if (!trapResult.isObject() && !trapResult.isNull()) {
</span><span class="lines">@@ -1131,13 +1135,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool targetIsExtensible = target->isExtensible(exec);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue();
</span><span class="cx"> if (targetIsExtensible)
</span><span class="cx"> return trapResult;
</span><span class="cx">
</span><span class="cx"> JSValue targetPrototype = target->getPrototype(vm, exec);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue();
</span><span class="cx"> if (!sameValue(exec, targetPrototype, trapResult)) {
</span><span class="cx"> throwVMTypeError(exec, scope, ASCIILiteral("Proxy's 'getPrototypeOf' trap for a non-extensible target should return the same value as the target's prototype"));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeReflectObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ReflectObject.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ReflectObject.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/ReflectObject.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> arguments.append(value);
</span><span class="cx"> return false;
</span><span class="cx"> });
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> return JSValue::encode(construct(exec, target, constructType, constructData, arguments, newTarget));
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> if (!target.isObject())
</span><span class="cx"> return JSValue::encode(throwTypeError(exec, scope, ASCIILiteral("Reflect.defineProperty requires the first argument be an object")));
</span><span class="cx"> auto propertyName = exec->argument(1).toPropertyKey(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> PropertyDescriptor descriptor;
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> if (!toPropertyDescriptor(exec, exec->argument(2), descriptor))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> ASSERT((descriptor.attributes() & Accessor) || (!descriptor.isAccessorDescriptor()));
</span><del>- ASSERT(!exec->hadException());
</del><ins>+ ASSERT(!scope.exception());
</ins><span class="cx">
</span><span class="cx"> // Reflect.defineProperty should not throw an error when the defineOwnProperty operation fails.
</span><span class="cx"> bool shouldThrow = false;
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> return JSValue::encode(throwTypeError(exec, scope, ASCIILiteral("Reflect.get requires the first argument be an object")));
</span><span class="cx">
</span><span class="cx"> const Identifier propertyName = exec->argument(1).toPropertyKey(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsNull());
</span><span class="cx">
</span><span class="cx"> JSValue receiver = target;
</span><span class="lines">@@ -200,7 +200,7 @@
</span><span class="cx"> return JSValue::encode(throwTypeError(exec, scope, ASCIILiteral("Reflect.getOwnPropertyDescriptor requires the first argument be an object")));
</span><span class="cx">
</span><span class="cx"> auto key = exec->argument(1).toPropertyKey(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> return JSValue::encode(objectConstructorGetOwnPropertyDescriptor(exec, asObject(target), key));
</span><span class="lines">@@ -229,7 +229,7 @@
</span><span class="cx"> return JSValue::encode(throwTypeError(exec, scope, ASCIILiteral("Reflect.isExtensible requires the first argument be an object")));
</span><span class="cx">
</span><span class="cx"> bool isExtensible = asObject(target)->isExtensible(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> return JSValue::encode(jsBoolean(isExtensible));
</span><span class="cx"> }
</span><span class="lines">@@ -257,7 +257,7 @@
</span><span class="cx"> return JSValue::encode(throwTypeError(exec, scope, ASCIILiteral("Reflect.preventExtensions requires the first argument be an object")));
</span><span class="cx"> JSObject* object = asObject(target);
</span><span class="cx"> bool result = object->methodTable(vm)->preventExtensions(object, exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> return JSValue::encode(jsBoolean(result));
</span><span class="cx"> }
</span><span class="lines">@@ -274,7 +274,7 @@
</span><span class="cx"> JSObject* targetObject = asObject(target);
</span><span class="cx">
</span><span class="cx"> auto propertyName = exec->argument(1).toPropertyKey(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> JSValue receiver = target;
</span><span class="lines">@@ -307,7 +307,7 @@
</span><span class="cx">
</span><span class="cx"> bool shouldThrowIfCantSet = false;
</span><span class="cx"> bool didSetPrototype = object->setPrototype(vm, exec, proto, shouldThrowIfCantSet);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> return JSValue::encode(jsBoolean(didSetPrototype));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeRegExpConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/RegExpConstructor.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/RegExpConstructor.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/RegExpConstructor.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -216,13 +216,13 @@
</span><span class="cx"> if (flags.isUndefined())
</span><span class="cx"> return NoFlags;
</span><span class="cx"> JSString* flagsString = flags.toString(exec);
</span><ins>+ ASSERT(scope.exception() || flagsString);
</ins><span class="cx"> if (!flagsString) {
</span><del>- ASSERT(exec->hadException());
</del><span class="cx"> return InvalidFlags;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RegExpFlags result = regExpFlags(flagsString->value(exec));
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return InvalidFlags;
</span><span class="cx"> if (result == InvalidFlags)
</span><span class="cx"> throwSyntaxError(exec, scope, ASCIILiteral("Invalid flags supplied to RegExp constructor."));
</span><span class="lines">@@ -235,7 +235,7 @@
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> String pattern = patternArg.isUndefined() ? emptyString() : patternArg.toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> RegExpFlags flags = toFlags(exec, flagsArg);
</span><span class="lines">@@ -247,7 +247,7 @@
</span><span class="cx"> return throwException(exec, scope, createSyntaxError(exec, regExp->errorMessage()));
</span><span class="cx">
</span><span class="cx"> Structure* structure = getRegExpStructure(exec, globalObject, newTarget);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> return RegExpObject::create(vm, structure, regExp);
</span><span class="cx"> }
</span><span class="lines">@@ -255,6 +255,7 @@
</span><span class="cx"> JSObject* constructRegExp(ExecState* exec, JSGlobalObject* globalObject, const ArgList& args, JSObject* callee, JSValue newTarget)
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSValue patternArg = args.at(0);
</span><span class="cx"> JSValue flagsArg = args.at(1);
</span><span class="cx">
</span><span class="lines">@@ -263,7 +264,7 @@
</span><span class="cx">
</span><span class="cx"> if (newTarget.isUndefined() && constructAsRegexp && flagsArg.isUndefined()) {
</span><span class="cx"> JSValue constructor = patternArg.get(exec, vm.propertyNames->constructor);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> if (callee == constructor) {
</span><span class="cx"> // We know that patternArg is a object otherwise constructAsRegexp would be false.
</span><span class="lines">@@ -274,7 +275,7 @@
</span><span class="cx"> if (isPatternRegExp) {
</span><span class="cx"> RegExp* regExp = jsCast<RegExpObject*>(patternArg)->regExp();
</span><span class="cx"> Structure* structure = getRegExpStructure(exec, globalObject, newTarget);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> if (!flagsArg.isUndefined()) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeRegExpConstructorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/RegExpConstructor.h (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/RegExpConstructor.h 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/RegExpConstructor.h 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -133,12 +133,13 @@
</span><span class="cx">
</span><span class="cx"> ALWAYS_INLINE bool isRegExp(VM& vm, ExecState* exec, JSValue value)
</span><span class="cx"> {
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> if (!value.isObject())
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> JSObject* object = asObject(value);
</span><span class="cx"> JSValue matchValue = object->get(exec, vm.propertyNames->matchSymbol);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> if (!matchValue.isUndefined())
</span><span class="cx"> return matchValue.toBoolean(exec);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeRegExpObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/RegExpObject.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/RegExpObject.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/RegExpObject.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx"> static unsigned maxSizeForDirectPath = 100000;
</span><span class="cx">
</span><span class="cx"> JSArray* array = constructEmptyArray(exec, nullptr);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> auto iterate = [&] () {
</span><span class="lines">@@ -233,14 +233,14 @@
</span><span class="cx">
</span><span class="cx"> JSValue RegExpObject::matchGlobal(ExecState* exec, JSGlobalObject* globalObject, JSString* string)
</span><span class="cx"> {
</span><ins>+ VM& vm = globalObject->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> RegExp* regExp = this->regExp();
</span><span class="cx">
</span><span class="cx"> ASSERT(regExp->global());
</span><span class="cx">
</span><del>- VM* vm = &globalObject->vm();
-
</del><span class="cx"> setLastIndex(exec, 0);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> String s = string->value(exec);
</span><span class="lines">@@ -249,7 +249,7 @@
</span><span class="cx"> if (regExp->unicode()) {
</span><span class="cx"> unsigned stringLength = s.length();
</span><span class="cx"> return collectMatches(
</span><del>- *vm, exec, string, s, regExpConstructor, regExp,
</del><ins>+ vm, exec, string, s, regExpConstructor, regExp,
</ins><span class="cx"> [&] (size_t end) -> size_t {
</span><span class="cx"> return advanceStringUnicode(s, stringLength, end);
</span><span class="cx"> });
</span><span class="lines">@@ -256,7 +256,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return collectMatches(
</span><del>- *vm, exec, string, s, regExpConstructor, regExp,
</del><ins>+ vm, exec, string, s, regExpConstructor, regExp,
</ins><span class="cx"> [&] (size_t end) -> size_t {
</span><span class="cx"> return end + 1;
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeRegExpPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/RegExpPrototype.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/RegExpPrototype.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/RegExpPrototype.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -159,13 +159,13 @@
</span><span class="cx"> regExp = asRegExpObject(arg0)->regExp();
</span><span class="cx"> } else {
</span><span class="cx"> String pattern = !exec->argumentCount() ? emptyString() : arg0.toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> RegExpFlags flags = NoFlags;
</span><span class="cx"> if (!arg1.isUndefined()) {
</span><span class="cx"> flags = regExpFlags(arg1.toString(exec)->value(exec));
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> if (flags == InvalidFlags)
</span><span class="cx"> return throwVMError(exec, scope, createSyntaxError(exec, ASCIILiteral("Invalid flags supplied to RegExp constructor.")));
</span><span class="lines">@@ -189,21 +189,22 @@
</span><span class="cx"> string[0] = 0;
</span><span class="cx">
</span><span class="cx"> VM& vm = exec->vm();
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx">
</span><span class="cx"> JSValue globalValue = regexp->get(exec, exec->propertyNames().global);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return string;
</span><span class="cx"> JSValue ignoreCaseValue = regexp->get(exec, exec->propertyNames().ignoreCase);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return string;
</span><span class="cx"> JSValue multilineValue = regexp->get(exec, exec->propertyNames().multiline);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return string;
</span><span class="cx"> JSValue unicodeValue = regexp->get(exec, exec->propertyNames().unicode);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return string;
</span><span class="cx"> JSValue stickyValue = regexp->get(exec, exec->propertyNames().sticky);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return string;
</span><span class="cx">
</span><span class="cx"> unsigned index = 0;
</span><span class="lines">@@ -238,17 +239,17 @@
</span><span class="cx"> return JSValue::encode(earlyReturnValue);
</span><span class="cx">
</span><span class="cx"> JSValue sourceValue = thisObject->get(exec, vm.propertyNames->source);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> String source = sourceValue.toString(exec)->value(exec);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> JSValue flagsValue = thisObject->get(exec, vm.propertyNames->flags);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> String flags = flagsValue.toString(exec)->value(exec);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> return JSValue::encode(jsMakeNontrivialString(exec, '/', source, '/', flags));
</span><span class="lines">@@ -339,7 +340,7 @@
</span><span class="cx"> return throwVMTypeError(exec, scope, ASCIILiteral("The RegExp.prototype.flags getter can only be called on an object"));
</span><span class="cx">
</span><span class="cx"> auto flags = flagsString(exec, asObject(thisValue));
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> return JSValue::encode(jsString(exec, flags.data()));
</span><span class="lines">@@ -472,12 +473,13 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL regExpProtoFuncSearchFast(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSValue thisValue = exec->thisValue();
</span><span class="cx"> RegExp* regExp = asRegExpObject(thisValue)->regExp();
</span><span class="cx">
</span><span class="cx"> JSString* string = exec->uncheckedArgument(0).toString(exec);
</span><span class="cx"> String s = string->value(exec);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> RegExpConstructor* regExpConstructor = exec->lexicalGlobalObject()->regExpConstructor();
</span><span class="lines">@@ -586,7 +588,7 @@
</span><span class="cx"> // 3. [handled by JS builtin] Let S be ? ToString(string).
</span><span class="cx"> JSString* inputString = exec->argument(0).toString(exec);
</span><span class="cx"> String input = inputString->value(exec);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> ASSERT(!input.isNull());
</span><span class="cx">
</span><span class="lines">@@ -601,7 +603,7 @@
</span><span class="cx"> // 11. Let A be ArrayCreate(0).
</span><span class="cx"> // 12. Let lengthA be 0.
</span><span class="cx"> JSArray* result = constructEmptyArray(exec, 0);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> unsigned resultLength = 0;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeSetConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/SetConstructor.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/SetConstructor.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/SetConstructor.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> return JSValue::encode(set);
</span><span class="cx">
</span><span class="cx"> JSValue adderFunction = set->get(exec, exec->propertyNames().add);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> CallData adderFunctionCallData;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStringConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/StringConstructor.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/StringConstructor.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/StringConstructor.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < length; ++i) {
</span><span class="cx"> double codePointAsDouble = exec->uncheckedArgument(i).toNumber(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> uint32_t codePoint = static_cast<uint32_t>(codePointAsDouble);
</span><span class="lines">@@ -122,10 +122,11 @@
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL constructWithStringConstructor(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSGlobalObject* globalObject = asInternalFunction(exec->callee())->globalObject();
</span><del>- VM& vm = exec->vm();
</del><ins>+ VM& vm = globalObject->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx">
</span><span class="cx"> Structure* structure = InternalFunction::createSubclassStructure(exec, exec->newTarget(), globalObject->stringObjectStructure());
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx">
</span><span class="cx"> if (!exec->argumentCount())
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStringObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/StringObject.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/StringObject.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/StringObject.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -108,6 +108,8 @@
</span><span class="cx">
</span><span class="cx"> bool StringObject::defineOwnProperty(JSObject* object, ExecState* exec, PropertyName propertyName, const PropertyDescriptor& descriptor, bool throwException)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> StringObject* thisObject = jsCast<StringObject*>(object);
</span><span class="cx">
</span><span class="cx"> if (isStringOwnProperty(exec, thisObject, propertyName)) {
</span><span class="lines">@@ -120,7 +122,7 @@
</span><span class="cx"> bool isCurrentDefined = thisObject->getOwnPropertyDescriptor(exec, propertyName, current);
</span><span class="cx"> ASSERT(isCurrentDefined);
</span><span class="cx"> bool isExtensible = thisObject->isExtensible(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> return validateAndApplyPropertyDescriptor(exec, nullptr, propertyName, isExtensible, descriptor, isCurrentDefined, current, throwException);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStringPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -477,9 +477,11 @@
</span><span class="cx"> VM& vm, ExecState* exec, JSString* string, JSValue searchValue, CallData& callData,
</span><span class="cx"> CallType callType, String& replacementString, JSValue replaceValue)
</span><span class="cx"> {
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> const String& source = string->value(exec);
</span><span class="cx"> unsigned sourceLen = source.length();
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> RegExpObject* regExpObject = asRegExpObject(searchValue);
</span><span class="cx"> RegExp* regExp = regExpObject->regExp();
</span><span class="lines">@@ -488,7 +490,7 @@
</span><span class="cx"> if (global) {
</span><span class="cx"> // ES5.1 15.5.4.10 step 8.a.
</span><span class="cx"> regExpObject->setLastIndex(exec, 0);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> if (callType == CallType::None && !replacementString.length())
</span><span class="lines">@@ -511,7 +513,7 @@
</span><span class="cx"> int argCount = regExp->numSubpatterns() + 1 + 2;
</span><span class="cx"> JSFunction* func = jsCast<JSFunction*>(replaceValue);
</span><span class="cx"> CachedCall cachedCall(exec, func, argCount);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> if (source.is8Bit()) {
</span><span class="cx"> while (true) {
</span><span class="lines">@@ -539,7 +541,7 @@
</span><span class="cx"> cachedCall.setThis(jsUndefined());
</span><span class="cx"> JSValue jsResult = cachedCall.call();
</span><span class="cx"> replacements.append(jsResult.toString(exec)->value(exec));
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> lastIndex = result.end;
</span><span class="lines">@@ -578,7 +580,7 @@
</span><span class="cx"> cachedCall.setThis(jsUndefined());
</span><span class="cx"> JSValue jsResult = cachedCall.call();
</span><span class="cx"> replacements.append(jsResult.toString(exec)->value(exec));
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> lastIndex = result.end;
</span><span class="lines">@@ -618,7 +620,7 @@
</span><span class="cx"> args.append(string);
</span><span class="cx">
</span><span class="cx"> replacements.append(call(exec, replaceValue, callType, callData, jsUndefined(), args).toString(exec)->value(exec));
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> } else {
</span><span class="cx"> int replLen = replacementString.length();
</span><span class="lines">@@ -658,12 +660,13 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(&vm, exec);
</span><del>-
</del><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> RegExp* regExp = searchValue->regExp();
</span><span class="cx"> if (regExp->global()) {
</span><span class="cx"> // ES5.1 15.5.4.10 step 8.a.
</span><span class="cx"> searchValue->setLastIndex(exec, 0);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> return removeUsingRegExpSearch(vm, exec, thisValue, thisValue->value(exec), regExp);
</span><span class="cx"> }
</span><span class="lines">@@ -688,12 +691,14 @@
</span><span class="cx">
</span><span class="cx"> static ALWAYS_INLINE EncodedJSValue replaceUsingRegExpSearch(VM& vm, ExecState* exec, JSString* string, JSValue searchValue, JSValue replaceValue)
</span><span class="cx"> {
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> String replacementString;
</span><span class="cx"> CallData callData;
</span><span class="cx"> CallType callType = getCallData(replaceValue, callData);
</span><span class="cx"> if (callType == CallType::None) {
</span><span class="cx"> replacementString = replaceValue.toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -701,11 +706,13 @@
</span><span class="cx"> vm, exec, string, searchValue, callData, callType, replacementString, replaceValue);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static ALWAYS_INLINE EncodedJSValue replaceUsingStringSearch(VM&, ExecState* exec, JSString* jsString, JSValue searchValue, JSValue replaceValue)
</del><ins>+static ALWAYS_INLINE EncodedJSValue replaceUsingStringSearch(VM& vm, ExecState* exec, JSString* jsString, JSValue searchValue, JSValue replaceValue)
</ins><span class="cx"> {
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> const String& string = jsString->value(exec);
</span><span class="cx"> String searchString = searchValue.toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> size_t matchStart = string.find(searchString);
</span><span class="lines">@@ -721,12 +728,12 @@
</span><span class="cx"> args.append(jsNumber(matchStart));
</span><span class="cx"> args.append(jsString);
</span><span class="cx"> replaceValue = call(exec, replaceValue, callType, callData, jsUndefined(), args);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String replaceString = replaceValue.toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> StringImpl* stringImpl = string.impl();
</span><span class="lines">@@ -811,7 +818,7 @@
</span><span class="cx"> if (!checkObjectCoercible(thisValue))
</span><span class="cx"> return throwVMTypeError(exec, scope);
</span><span class="cx"> JSString* string = thisValue.toString(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> return replace(vm, exec, string, searchValue, replaceValue);
</span><span class="cx"> }
</span><span class="lines">@@ -818,8 +825,11 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL stringProtoFuncReplaceUsingRegExp(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> JSString* string = exec->thisValue().toString(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> JSValue searchValue = exec->argument(0);
</span><span class="lines">@@ -831,8 +841,11 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL stringProtoFuncReplaceUsingStringSearch(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> JSString* string = exec->thisValue().toString(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> return replaceUsingStringSearch(exec->vm(), exec, string, exec->argument(0), exec->argument(1));
</span><span class="lines">@@ -941,7 +954,7 @@
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (UNLIKELY(exec->hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> double doublePosition = argument0.toInteger(exec);
</span><span class="lines">@@ -1053,7 +1066,7 @@
</span><span class="cx"> if (!checkObjectCoercible(thisValue))
</span><span class="cx"> return throwVMTypeError(exec, scope);
</span><span class="cx"> String s = thisValue.toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> int len = s.length();
</span><span class="lines">@@ -1111,6 +1124,7 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL stringProtoFuncSplitFast(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSValue thisValue = exec->thisValue();
</span><span class="cx"> ASSERT(checkObjectCoercible(thisValue));
</span><span class="cx">
</span><span class="lines">@@ -1117,7 +1131,7 @@
</span><span class="cx"> // 3. Let S be the result of calling ToString, giving it the this value as its argument.
</span><span class="cx"> // 7. Let s be the number of characters in S.
</span><span class="cx"> String input = thisValue.toString(exec)->value(exec);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> ASSERT(!input.isNull());
</span><span class="cx">
</span><span class="lines">@@ -1124,7 +1138,7 @@
</span><span class="cx"> // 4. Let A be a new array created as if by the expression new Array()
</span><span class="cx"> // where Array is the standard built-in constructor with that name.
</span><span class="cx"> JSArray* result = constructEmptyArray(exec, 0);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> // 5. Let lengthA be 0.
</span><span class="lines">@@ -1141,7 +1155,7 @@
</span><span class="cx"> // otherwise let R = ToString(separator).
</span><span class="cx"> JSValue separatorValue = exec->uncheckedArgument(0);
</span><span class="cx"> String separator = separatorValue.toString(exec)->value(exec);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> // 10. If lim == 0, return A.
</span><span class="lines">@@ -1250,7 +1264,7 @@
</span><span class="cx"> len = jsString->length();
</span><span class="cx"> } else {
</span><span class="cx"> uString = thisValue.toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> len = uString.length();
</span><span class="cx"> }
</span><span class="lines">@@ -1303,7 +1317,7 @@
</span><span class="cx"> return throwVMTypeError(exec, scope);
</span><span class="cx">
</span><span class="cx"> JSString* jsString = thisValue.toString(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> JSValue a0 = exec->argument(0);
</span><span class="lines">@@ -1377,12 +1391,12 @@
</span><span class="cx"> if (!checkObjectCoercible(thisValue))
</span><span class="cx"> return throwVMTypeError(exec, scope);
</span><span class="cx"> String s = thisValue.toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> JSValue a0 = exec->argument(0);
</span><span class="cx"> String str = a0.toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> return JSValue::encode(jsNumber(Collator().collate(s, str)));
</span><span class="cx"> }
</span><span class="lines">@@ -1403,7 +1417,7 @@
</span><span class="cx"> const String& s = sVal->value(state);
</span><span class="cx">
</span><span class="cx"> // 3. ReturnIfAbrupt(S).
</span><del>- if (state->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> // Optimization for empty strings.
</span><span class="lines">@@ -1414,7 +1428,7 @@
</span><span class="cx"> Vector<String> requestedLocales = canonicalizeLocaleList(*state, state->argument(0));
</span><span class="cx">
</span><span class="cx"> // 5. ReturnIfAbrupt(requestedLocales).
</span><del>- if (state->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> // 6. Let len be the number of elements in requestedLocales.
</span><span class="lines">@@ -1498,7 +1512,7 @@
</span><span class="cx"> if (!checkObjectCoercible(thisValue))
</span><span class="cx"> return throwVMTypeError(exec, scope);
</span><span class="cx"> String s = thisValue.toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> return JSValue::encode(jsMakeNontrivialString(exec, "<big>", s, "</big>"));
</span><span class="cx"> }
</span><span class="lines">@@ -1512,7 +1526,7 @@
</span><span class="cx"> if (!checkObjectCoercible(thisValue))
</span><span class="cx"> return throwVMTypeError(exec, scope);
</span><span class="cx"> String s = thisValue.toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> return JSValue::encode(jsMakeNontrivialString(exec, "<small>", s, "</small>"));
</span><span class="cx"> }
</span><span class="lines">@@ -1526,7 +1540,7 @@
</span><span class="cx"> if (!checkObjectCoercible(thisValue))
</span><span class="cx"> return throwVMTypeError(exec, scope);
</span><span class="cx"> String s = thisValue.toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> return JSValue::encode(jsMakeNontrivialString(exec, "<blink>", s, "</blink>"));
</span><span class="cx"> }
</span><span class="lines">@@ -1540,7 +1554,7 @@
</span><span class="cx"> if (!checkObjectCoercible(thisValue))
</span><span class="cx"> return throwVMTypeError(exec, scope);
</span><span class="cx"> String s = thisValue.toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> return JSValue::encode(jsMakeNontrivialString(exec, "<b>", s, "</b>"));
</span><span class="cx"> }
</span><span class="lines">@@ -1554,7 +1568,7 @@
</span><span class="cx"> if (!checkObjectCoercible(thisValue))
</span><span class="cx"> return throwVMTypeError(exec, scope);
</span><span class="cx"> String s = thisValue.toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> return JSValue::encode(jsMakeNontrivialString(exec, "<tt>", s, "</tt>"));
</span><span class="cx"> }
</span><span class="lines">@@ -1568,7 +1582,7 @@
</span><span class="cx"> if (!checkObjectCoercible(thisValue))
</span><span class="cx"> return throwVMTypeError(exec, scope);
</span><span class="cx"> String s = thisValue.toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> return JSValue::encode(jsMakeNontrivialString(exec, "<i>", s, "</i>"));
</span><span class="cx"> }
</span><span class="lines">@@ -1582,7 +1596,7 @@
</span><span class="cx"> if (!checkObjectCoercible(thisValue))
</span><span class="cx"> return throwVMTypeError(exec, scope);
</span><span class="cx"> String s = thisValue.toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> return JSValue::encode(jsMakeNontrivialString(exec, "<strike>", s, "</strike>"));
</span><span class="cx"> }
</span><span class="lines">@@ -1596,7 +1610,7 @@
</span><span class="cx"> if (!checkObjectCoercible(thisValue))
</span><span class="cx"> return throwVMTypeError(exec, scope);
</span><span class="cx"> String s = thisValue.toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> return JSValue::encode(jsMakeNontrivialString(exec, "<sub>", s, "</sub>"));
</span><span class="cx"> }
</span><span class="lines">@@ -1610,7 +1624,7 @@
</span><span class="cx"> if (!checkObjectCoercible(thisValue))
</span><span class="cx"> return throwVMTypeError(exec, scope);
</span><span class="cx"> String s = thisValue.toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> return JSValue::encode(jsMakeNontrivialString(exec, "<sup>", s, "</sup>"));
</span><span class="cx"> }
</span><span class="lines">@@ -1624,7 +1638,7 @@
</span><span class="cx"> if (!checkObjectCoercible(thisValue))
</span><span class="cx"> return throwVMTypeError(exec, scope);
</span><span class="cx"> String s = thisValue.toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> JSValue a0 = exec->argument(0);
</span><span class="lines">@@ -1643,7 +1657,7 @@
</span><span class="cx"> if (!checkObjectCoercible(thisValue))
</span><span class="cx"> return throwVMTypeError(exec, scope);
</span><span class="cx"> String s = thisValue.toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> JSValue a0 = exec->argument(0);
</span><span class="lines">@@ -1698,7 +1712,7 @@
</span><span class="cx"> if (!checkObjectCoercible(thisValue))
</span><span class="cx"> return throwVMTypeError(exec, scope);
</span><span class="cx"> String s = thisValue.toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> JSValue a0 = exec->argument(0);
</span><span class="lines">@@ -1717,7 +1731,7 @@
</span><span class="cx"> if (!checkObjectCoercible(thisValue))
</span><span class="cx"> return throwVMTypeError(exec, scope);
</span><span class="cx"> String s = thisValue.toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> JSValue a0 = exec->argument(0);
</span><span class="lines">@@ -1765,7 +1779,7 @@
</span><span class="cx"> if (!checkObjectCoercible(thisValue))
</span><span class="cx"> return throwTypeError(exec, scope);
</span><span class="cx"> String str = thisValue.toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> unsigned left = 0;
</span><span class="lines">@@ -1823,18 +1837,18 @@
</span><span class="cx"> return throwVMTypeError(exec, scope);
</span><span class="cx">
</span><span class="cx"> String stringToSearchIn = thisValue.toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> JSValue a0 = exec->argument(0);
</span><span class="cx"> bool isRegularExpression = isRegExp(vm, exec, a0);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> if (isRegularExpression)
</span><span class="cx"> return throwVMTypeError(exec, scope, "Argument to String.prototype.startsWith cannot be a RegExp");
</span><span class="cx">
</span><span class="cx"> String searchString = a0.toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> JSValue positionArg = exec->argument(1);
</span><span class="lines">@@ -1844,7 +1858,7 @@
</span><span class="cx"> else {
</span><span class="cx"> unsigned length = stringToSearchIn.length();
</span><span class="cx"> start = clampAndTruncateToUnsigned(positionArg.toInteger(exec), 0, length);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1861,18 +1875,18 @@
</span><span class="cx"> return throwVMTypeError(exec, scope);
</span><span class="cx">
</span><span class="cx"> String stringToSearchIn = thisValue.toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> JSValue a0 = exec->argument(0);
</span><span class="cx"> bool isRegularExpression = isRegExp(vm, exec, a0);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> if (isRegularExpression)
</span><span class="cx"> return throwVMTypeError(exec, scope, "Argument to String.prototype.endsWith cannot be a RegExp");
</span><span class="cx">
</span><span class="cx"> String searchString = a0.toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> unsigned length = stringToSearchIn.length();
</span><span class="lines">@@ -1883,7 +1897,7 @@
</span><span class="cx"> end = std::max(0, endPositionArg.asInt32());
</span><span class="cx"> else if (!endPositionArg.isUndefined()) {
</span><span class="cx"> end = clampAndTruncateToUnsigned(endPositionArg.toInteger(exec), 0, length);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1892,6 +1906,7 @@
</span><span class="cx">
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL stringIncludesImpl(VM& vm, ExecState* exec, String stringToSearchIn, String searchString, JSValue positionArg)
</span><span class="cx"> {
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> unsigned start = 0;
</span><span class="cx"> if (positionArg.isInt32())
</span><span class="cx"> start = std::max(0, positionArg.asInt32());
</span><span class="lines">@@ -1898,7 +1913,7 @@
</span><span class="cx"> else {
</span><span class="cx"> unsigned length = stringToSearchIn.length();
</span><span class="cx"> start = clampAndTruncateToUnsigned(positionArg.toInteger(exec), 0, length);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1915,18 +1930,18 @@
</span><span class="cx"> return throwVMTypeError(exec, scope);
</span><span class="cx">
</span><span class="cx"> String stringToSearchIn = thisValue.toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> JSValue a0 = exec->argument(0);
</span><span class="cx"> bool isRegularExpression = isRegExp(vm, exec, a0);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> if (isRegularExpression)
</span><span class="cx"> return throwVMTypeError(exec, scope, "Argument to String.prototype.includes cannot be a RegExp");
</span><span class="cx">
</span><span class="cx"> String searchString = a0.toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> JSValue positionArg = exec->argument(1);
</span><span class="lines">@@ -1936,17 +1951,19 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL builtinStringIncludesInternal(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> JSValue thisValue = exec->thisValue();
</span><span class="cx"> ASSERT(checkObjectCoercible(thisValue));
</span><span class="cx">
</span><span class="cx"> String stringToSearchIn = thisValue.toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> JSValue a0 = exec->uncheckedArgument(0);
</span><del>- VM& vm = exec->vm();
</del><span class="cx"> String searchString = a0.toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> JSValue positionArg = exec->argument(1);
</span><span class="lines">@@ -2002,7 +2019,7 @@
</span><span class="cx"> if (!checkObjectCoercible(thisValue))
</span><span class="cx"> return throwVMTypeError(exec, scope);
</span><span class="cx"> JSString::SafeView source = thisValue.toString(exec)->view(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> UNormalizationMode form = UNORM_NFC;
</span><span class="lines">@@ -2009,7 +2026,7 @@
</span><span class="cx"> // Verify that the argument is provided and is not undefined.
</span><span class="cx"> if (!exec->argument(0).isUndefined()) {
</span><span class="cx"> String formString = exec->uncheckedArgument(0).toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> if (formString == "NFC")
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeSymbolConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/SymbolConstructor.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/SymbolConstructor.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/SymbolConstructor.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -96,11 +96,14 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL symbolConstructorFor(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> JSString* stringKey = exec->argument(0).toString(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> String string = stringKey->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> return JSValue::encode(Symbol::create(exec->vm(), exec->vm().symbolRegistry().symbolForKey(string)));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeTemplateRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/TemplateRegistry.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/TemplateRegistry.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/TemplateRegistry.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -45,12 +45,13 @@
</span><span class="cx"> return cached;
</span><span class="cx">
</span><span class="cx"> VM& vm = exec->vm();
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> unsigned count = templateKey.cookedStrings().size();
</span><span class="cx"> JSArray* templateObject = constructEmptyArray(exec, nullptr, count);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> JSArray* rawObject = constructEmptyArray(exec, nullptr, count);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> for (unsigned index = 0; index < count; ++index) {
</span><span class="lines">@@ -59,12 +60,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> objectConstructorFreeze(exec, rawObject);
</span><del>- ASSERT(!exec->hadException());
</del><ins>+ ASSERT(!scope.exception());
</ins><span class="cx">
</span><span class="cx"> templateObject->putDirect(vm, exec->propertyNames().raw, rawObject, ReadOnly | DontEnum | DontDelete);
</span><span class="cx">
</span><span class="cx"> objectConstructorFreeze(exec, templateObject);
</span><del>- ASSERT(!exec->hadException());
</del><ins>+ ASSERT(!scope.exception());
</ins><span class="cx">
</span><span class="cx"> m_templateMap.set(templateKey, templateObject);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeThrowScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ThrowScope.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ThrowScope.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/ThrowScope.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -26,256 +26,26 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ThrowScope.h"
</span><span class="cx">
</span><ins>+#include "Exception.h"
</ins><span class="cx"> #include "JSCInlines.h"
</span><span class="cx"> #include "VM.h"
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-#if ENABLE(THROW_SCOPE_VERIFICATION)
</del><ins>+#if ENABLE(EXCEPTION_SCOPE_VERIFICATION)
</ins><span class="cx">
</span><del>-namespace {
-
-// Logs all ThrowScope activity to help debug the source of a verification failure.
-bool traceOn = false;
-
-// A more verbose logging option to dump the C++ stack trace at strategic points to aid debugging.
-bool traceWithStackTraces = false;
-
-// Disabled temporarily until all known verification failures are fixed.
-bool verificationOn = false;
-
-unsigned traceCount = 0;
-};
-
-/*
- ThrowScope verification works to simulate exception throws and catch cases where
- exception checks are missing. This is how it works:
-
- 1. The VM has a m_needExceptionCheck bit that indicates where an exception check is
- needed. You can think of the m_needExceptionCheck bit being set as a simulated
- throw.
-
- 2. Every throw site must declare a ThrowScope instance using DECLARE_THROW_SCOPE at
- the top of its function (as early as possible) e.g.
-
- void foo(...)
- {
- auto scope = DECLARE_THROW_SCOPE(vm);
- throwException(exec, scope, ...);
- }
-
- Note: VM::throwException() methods are private, and only calleableby the ThrowScope
- friend class. All throws must go through a ThrowScope. Hence, we are guaranteed that
- any function that can throw will have a ThrowScope.
-
- Note: by convention, every throw helper function must take a ThrowScope argument
- instead of instantiating its own ThrowScope. This allows the throw to be attributed
- to the client code rather than the throw helper itself.
-
- 3. Verification of needed exception checks
-
- a. On construction, each ThrowScope will verify that VM::m_needExceptionCheck is
- not set.
-
- This ensures that the caller of the current function has checked for exceptions
- where needed before doing more work which led to calling the current function.
-
- b. On destruction, each ThrowScope will verify that VM::m_needExceptionCheck is
- not set. This verification will be skipped if the ThrowScope has been released
- (see (5) below).
-
- This ensures that the function that owns this ThrowScope is not missing any
- exception checks before returning.
-
- c. When throwing an exception, the ThrowScope will verify that VM::m_needExceptionCheck
- is not set, unless it's been ask to rethrow the same Exception object.
-
- 4. Simulated throws
-
- Throws are simulated by setting the m_needExceptionCheck bit.
-
- The bit will only be set in the ThrowScope destructor except when the ThrowScope
- detects the caller is a LLInt or JIT function. LLInt or JIT functions will always
- check for exceptions after a host C++ function returns to it. However, they will
- not clear the m_needExceptionCheck bit.
-
- Hence, if the ThrowScope destructor detects the caller is a LLInt or JIT function,
- it will just skip the setting of the bit.
-
- Note: there is no need, and it is incorrect to set the m_needExceptionCheck bit
- in the throwException methods. This is because, in practice, we always return
- immediately after throwing an exception. It doesn't make sense to set the bit in
- the throw just to have to clear it immediately after before we do verification in
- the ThrowScope destructor.
-
- 5. Using ThrowScope::release()
-
- ThrowScope::release() should only be used at the bottom of a function if:
-
- a. This function is going to let its caller check and handle the exception.
-
- void foo(...)
- {
- auto scope = DECLARE_THROW_SCOPE(vm);
- auto result = goo(); // may throw.
-
- ... // Cleanup code that will are not affected by a pending exceptions.
-
- scope.release(); // tell the ThrowScope that the caller will handle the exception.
- return result;
- }
-
- b. This function is going to do a tail call that may throw.
-
- void foo(...)
- {
- auto scope = DECLARE_THROW_SCOPE(vm);
- ...
- scope.release(); // tell the ThrowScope that the caller will handle the exception.
- return goo(); // may throw.
- }
-
- ThrowScope::release() should not be used in the code paths that branch. For example:
-
- void foo(...)
- {
- auto scope = DECLARE_THROW_SCOPE(vm);
-
- auto result = goo1(); // may throw.
- scope.release(); // <=================== the WRONG way !!!
- if (result)
- return;
-
- result = goo2(); // may throw.
- ...
- return result;
- }
-
- The above will result in a verification failure in goo2()'s ThrowScope. The proper way
- to fix this verification is to do wither (6) or (7) below.
-
- 6. Checking exceptions with ThrowScope::exception()
-
- ThrowScope::exception() returns the thrown Exception object if there is one pending.
- Else it returns nullptr.
-
- It also clears the m_needExceptionCheck bit thereby indicating that we've satisifed
- the needed exception check.
-
- This is how we do it:
-
- void foo(...)
- {
- auto scope = DECLARE_THROW_SCOPE(vm);
-
- auto result = goo1(); // may throw.
- if (scope.exception())
- return;
-
- result = goo2(); // may throw.
- ...
- return result;
- }
-
- But sometimes, for optimization reasons, we may choose to test the result of the callee
- function instead doing a load of the VM exception value. See (7) below.
-
- 7. Checking exception by checking callee result
-
- This approach should only be applied when it makes a difference to performance.
- If we need to do this, we should add an ASSERT() that invokes ThrowScope::exception()
- and verify the result. Since ThrowScope verification is only done on DEBUG builds,
- this ASSERT will satisfy the verification requirements while not impacting performance.
-
- This is how we do it:
-
- void foo(...)
- {
- auto scope = DECLARE_THROW_SCOPE(vm);
-
- bool failed = goo1(); // may throw.
- ASSERT(!!scope.exception() == failed)
- if (failed)
- return;
-
- result = goo2(); // may throw.
- ...
- return result;
- }
-
- 8. Debugging verification failures.
-
- a. When verification fails, you will see a helpful message followed by an assertion failure.
- For example:
-
- FAILED exception check verification:
- Exception thrown from ThrowScope [2] Exit: setUpCall @ /Volumes/Data/ws6/OpenSource/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp:1245
- is unchecked in ThrowScope [1]: varargsSetup @ /Volumes/Data/ws6/OpenSource/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp:1398
-
- The message tells you that failure was detected at in varargsSetup() @ LLIntSlowPaths.cpp
- line 1398, and that the missing exception check should have happened somewhere between
- the call to setUpCall() @ LLIntSlowPaths.cpp line 1245 and it.
-
- If that is insufficient information, you can ...
-
- b. Turn on ThrowScope tracing
-
- Just set traceOn=true at the top of ThrowScope.cpp, and rebuild. Thereafter, you should
- see a trace of ThrowScopes being entered and exited as well as their depth e.g.
-
- ThrowScope [1] Enter: llint_slow_path_jfalse @ /Volumes/Data/ws6/OpenSource/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp:1032
- ThrowScope [1] Exit: llint_slow_path_jfalse @ /Volumes/Data/ws6/OpenSource/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp:1032
-
- You will also see traces of simulated throws e.g.
-
- ThrowScope [2] Throw from: setUpCall @ /Volumes/Data/ws6/OpenSource/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp:1245
-
- If that is insufficient information, you can ...
-
- c. Turn on ThrowScope stack dumps
-
- Just set traceWithStackTraces=true at the top of ThrowScope.cpp, and rebuild.
- Thereafter, you should see a stack traces at various relevant ThrowScope events.
-
- d. Using throwScopePrintIfNeedCheck()
-
- If you have isolated the missing exception check to a function that is large but
- is unsure which statement can throw and is missing the check, you can sprinkle
- the function with calls to throwScopePrintIfNeedCheck().
-
- throwScopePrintIfNeedCheck() will log a line "Need exception check at ..." that
- inlcudes the file and line number only when it see the m_needExceptionCheck set.
- This will tell you which statement simulated the throw that is not being checked
- i.e. the one that preceded the throwScopePrintIfNeedCheck() that printed a line.
-*/
-
-ThrowScope::ThrowScope(VM& vm, ThrowScopeLocation location)
- : m_vm(vm)
- , m_previousScope(vm.m_topThrowScope)
- , m_location(location)
- , m_depth(m_previousScope ? m_previousScope->m_depth + 1 : 0)
</del><ins>+ThrowScope::ThrowScope(VM& vm, ExceptionEventLocation location)
+ : ExceptionScope(vm, location)
</ins><span class="cx"> {
</span><del>- m_vm.m_topThrowScope = this;
-
- if (traceOn) {
- dataLog("<", traceCount++, "> ThrowScope [", m_depth, "] Enter: ", location.functionName, " @ ", location.file, ":", location.line);
- if (m_vm.m_needExceptionCheck)
- dataLog(", needs check");
- dataLog("\n");
-
- if (traceWithStackTraces)
- WTFReportBacktrace();
- }
-
- verifyExceptionCheckNeedIsSatisfied(Site::ScopeEntry);
</del><ins>+ m_vm.verifyExceptionCheckNeedIsSatisfied(m_recursionDepth, m_location);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ThrowScope::~ThrowScope()
</span><span class="cx"> {
</span><del>- RELEASE_ASSERT(m_vm.m_topThrowScope);
</del><ins>+ RELEASE_ASSERT(m_vm.m_topExceptionScope);
</ins><span class="cx">
</span><span class="cx"> if (!m_isReleased)
</span><del>- verifyExceptionCheckNeedIsSatisfied(Site::ScopeExit);
</del><ins>+ m_vm.verifyExceptionCheckNeedIsSatisfied(m_recursionDepth, m_location);
</ins><span class="cx"> else {
</span><span class="cx"> // If we released the scope, that means we're letting our callers do the
</span><span class="cx"> // exception check. However, because our caller may be a LLInt or JIT
</span><span class="lines">@@ -298,26 +68,12 @@
</span><span class="cx">
</span><span class="cx"> if (!willBeHandleByLLIntOrJIT)
</span><span class="cx"> simulateThrow();
</span><del>-
- if (traceOn) {
- dataLog("<", traceCount++, "> ThrowScope [", m_depth, "] Exit: ", m_location.functionName, " @ ", m_location.file, ":", m_location.line);
- if (!willBeHandleByLLIntOrJIT)
- dataLog(", with rethrow");
- if (m_vm.m_needExceptionCheck)
- dataLog(", needs check");
- dataLog("\n");
-
- if (traceWithStackTraces)
- WTFReportBacktrace();
- }
-
- m_vm.m_topThrowScope = m_previousScope;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ThrowScope::throwException(ExecState* exec, Exception* exception)
</span><span class="cx"> {
</span><span class="cx"> if (m_vm.exception() && m_vm.exception() != exception)
</span><del>- verifyExceptionCheckNeedIsSatisfied(Site::Throw);
</del><ins>+ m_vm.verifyExceptionCheckNeedIsSatisfied(m_recursionDepth, m_location);
</ins><span class="cx">
</span><span class="cx"> m_vm.throwException(exec, exception);
</span><span class="cx"> }
</span><span class="lines">@@ -325,7 +81,7 @@
</span><span class="cx"> JSValue ThrowScope::throwException(ExecState* exec, JSValue error)
</span><span class="cx"> {
</span><span class="cx"> if (!error.isCell() || !jsDynamicCast<Exception*>(error.asCell()))
</span><del>- verifyExceptionCheckNeedIsSatisfied(Site::Throw);
</del><ins>+ m_vm.verifyExceptionCheckNeedIsSatisfied(m_recursionDepth, m_location);
</ins><span class="cx">
</span><span class="cx"> return m_vm.throwException(exec, error);
</span><span class="cx"> }
</span><span class="lines">@@ -333,63 +89,25 @@
</span><span class="cx"> JSObject* ThrowScope::throwException(ExecState* exec, JSObject* obj)
</span><span class="cx"> {
</span><span class="cx"> if (!jsDynamicCast<Exception*>(obj))
</span><del>- verifyExceptionCheckNeedIsSatisfied(Site::Throw);
</del><ins>+ m_vm.verifyExceptionCheckNeedIsSatisfied(m_recursionDepth, m_location);
</ins><span class="cx">
</span><span class="cx"> return m_vm.throwException(exec, obj);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ThrowScope::printIfNeedCheck(const char* functionName, const char* file, unsigned line)
-{
- if (m_vm.m_needExceptionCheck)
- dataLog("<", traceCount++, "> Need exception check at ", functionName, " @ ", file, ":", line, "\n");
-}
-
</del><span class="cx"> void ThrowScope::simulateThrow()
</span><span class="cx"> {
</span><del>- RELEASE_ASSERT(m_vm.m_topThrowScope);
</del><ins>+ RELEASE_ASSERT(m_vm.m_topExceptionScope);
</ins><span class="cx"> m_vm.m_simulatedThrowPointLocation = m_location;
</span><del>- m_vm.m_simulatedThrowPointDepth = m_depth;
</del><ins>+ m_vm.m_simulatedThrowPointRecursionDepth = m_recursionDepth;
</ins><span class="cx"> m_vm.m_needExceptionCheck = true;
</span><span class="cx">
</span><del>- if (traceOn) {
- dataLog("<", traceCount++, "> ThrowScope [", m_depth, "] Throw from: ", m_location.functionName, " @ ", m_location.file, ":", m_location.line, "\n");
- if (traceWithStackTraces)
- WTFReportBacktrace();
</del><ins>+ if (Options::dumpSimulatedThrows()) {
+ dataLog("Simulated throw from this scope: ", m_location, "\n");
+ dataLog(" (ExceptionScope::m_recursionDepth was ", m_recursionDepth, ")\n");
+ WTFReportBacktrace();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ThrowScope::verifyExceptionCheckNeedIsSatisfied(ThrowScope::Site site)
-{
- if (!verificationOn)
- return;
-
- if (UNLIKELY(m_vm.m_needExceptionCheck)) {
- auto failDepth = m_vm.m_simulatedThrowPointDepth;
- auto& failLocation = m_vm.m_simulatedThrowPointLocation;
-
- auto siteName = [] (Site site) -> const char* {
- switch (site) {
- case Site::ScopeEntry:
- return "Entry";
- case Site::ScopeExit:
- return "Exit";
- case Site::Throw:
- return "Throw";
- }
- RELEASE_ASSERT_NOT_REACHED();
- return nullptr;
- };
-
- dataLog(
- "FAILED exception check verification:\n"
- " Exception thrown from ThrowScope [", failDepth, "] ", siteName(site), ": ", failLocation.functionName, " @ ", failLocation.file, ":", failLocation.line, "\n"
- " is unchecked in ThrowScope [", m_depth, "]: ", m_location.functionName, " @ ", m_location.file, ":", m_location.line, "\n"
- "\n");
-
- RELEASE_ASSERT(!m_vm.m_needExceptionCheck);
- }
-}
-
-#endif // ENABLE(THROW_SCOPE_VERIFICATION)
</del><ins>+#endif // ENABLE(EXCEPTION_SCOPE_VERIFICATION)
</ins><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeThrowScopeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ThrowScope.h (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ThrowScope.h 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/ThrowScope.h 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -26,8 +26,7 @@
</span><span class="cx"> #ifndef ThrowScope_h
</span><span class="cx"> #define ThrowScope_h
</span><span class="cx">
</span><del>-#include "Exception.h"
-#include "VM.h"
</del><ins>+#include "ExceptionScope.h"
</ins><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="lines">@@ -34,80 +33,62 @@
</span><span class="cx"> class ExecState;
</span><span class="cx"> class JSObject;
</span><span class="cx">
</span><del>-#if ENABLE(THROW_SCOPE_VERIFICATION)
</del><ins>+#if ENABLE(EXCEPTION_SCOPE_VERIFICATION)
</ins><span class="cx">
</span><del>-class ThrowScope {
</del><ins>+// If a function can throw a JS exception, it should declare a ThrowScope at the
+// top of the function (as early as possible) using the DECLARE_THROW_SCOPE macro.
+// Declaring a ThrowScope in a function means that the function may throw an
+// exception that its caller will have to handle.
+
+class ThrowScope : public ExceptionScope {
</ins><span class="cx"> public:
</span><del>- JS_EXPORT_PRIVATE ThrowScope(VM&, ThrowScopeLocation);
</del><ins>+ JS_EXPORT_PRIVATE ThrowScope(VM&, ExceptionEventLocation);
</ins><span class="cx"> JS_EXPORT_PRIVATE ~ThrowScope();
</span><span class="cx">
</span><span class="cx"> ThrowScope(const ThrowScope&) = delete;
</span><span class="cx"> ThrowScope(ThrowScope&&) = default;
</span><span class="cx">
</span><del>- VM& vm() const { return m_vm; }
-
</del><span class="cx"> JS_EXPORT_PRIVATE void throwException(ExecState*, Exception*);
</span><span class="cx"> JS_EXPORT_PRIVATE JSValue throwException(ExecState*, JSValue);
</span><span class="cx"> JS_EXPORT_PRIVATE JSObject* throwException(ExecState*, JSObject*);
</span><span class="cx">
</span><del>- inline Exception* exception()
- {
- m_vm.m_needExceptionCheck = false;
- return m_vm.exception();
- }
</del><ins>+ void release() { m_isReleased = true; }
</ins><span class="cx">
</span><del>- inline void release() { m_isReleased = true; }
-
</del><span class="cx"> JS_EXPORT_PRIVATE void printIfNeedCheck(const char* functionName, const char* file, unsigned line);
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void simulateThrow();
</span><span class="cx">
</span><del>- enum class Site {
- ScopeEntry,
- ScopeExit,
- Throw
- };
- void verifyExceptionCheckNeedIsSatisfied(Site);
-
- VM& m_vm;
- ThrowScope* m_previousScope;
- ThrowScopeLocation m_location;
- unsigned m_depth;
</del><span class="cx"> bool m_isReleased { false };
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #define DECLARE_THROW_SCOPE(vm__) \
</span><del>- JSC::ThrowScope((vm__), JSC::ThrowScopeLocation(__FUNCTION__, __FILE__, __LINE__))
</del><ins>+ JSC::ThrowScope((vm__), JSC::ExceptionEventLocation(__FUNCTION__, __FILE__, __LINE__))
</ins><span class="cx">
</span><span class="cx"> #define throwScopePrintIfNeedCheck(scope__) \
</span><span class="cx"> scope__.printIfNeedCheck(__FUNCTION__, __FILE__, __LINE__)
</span><span class="cx">
</span><del>-#else // not ENABLE(THROW_SCOPE_VERIFICATION)
</del><ins>+#else // not ENABLE(EXCEPTION_SCOPE_VERIFICATION)
</ins><span class="cx">
</span><del>-class ThrowScope {
</del><ins>+class ThrowScope : public ExceptionScope {
</ins><span class="cx"> public:
</span><del>- ThrowScope(VM& vm)
- : m_vm(vm)
</del><ins>+ ALWAYS_INLINE ThrowScope(VM& vm)
+ : ExceptionScope(vm)
</ins><span class="cx"> { }
</span><ins>+ ThrowScope(const ThrowScope&) = delete;
+ ThrowScope(ThrowScope&&) = default;
</ins><span class="cx">
</span><del>- VM& vm() const { return m_vm; }
-
- void throwException(ExecState* exec, Exception* exception) { m_vm.throwException(exec, exception); }
- JSValue throwException(ExecState* exec, JSValue value) { return m_vm.throwException(exec, value); }
- JSObject* throwException(ExecState* exec, JSObject* obj) { return m_vm.throwException(exec, obj); }
-
- Exception* exception() { return m_vm.exception(); }
- void release() { }
-
-private:
- VM& m_vm;
</del><ins>+ ALWAYS_INLINE void throwException(ExecState* exec, Exception* exception) { m_vm.throwException(exec, exception); }
+ ALWAYS_INLINE JSValue throwException(ExecState* exec, JSValue value) { return m_vm.throwException(exec, value); }
+ ALWAYS_INLINE JSObject* throwException(ExecState* exec, JSObject* obj) { return m_vm.throwException(exec, obj); }
+
+ ALWAYS_INLINE void release() { }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #define DECLARE_THROW_SCOPE(vm__) \
</span><span class="cx"> JSC::ThrowScope((vm__))
</span><span class="cx">
</span><del>-#endif // ENABLE(THROW_SCOPE_VERIFICATION)
</del><ins>+#endif // ENABLE(EXCEPTION_SCOPE_VERIFICATION)
</ins><span class="cx">
</span><span class="cx"> ALWAYS_INLINE void throwException(ExecState* exec, ThrowScope& scope, Exception* exception)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeThrowScopeLocationh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/runtime/ThrowScopeLocation.h (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ThrowScopeLocation.h 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/ThrowScopeLocation.h 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -1,43 +0,0 @@
</span><del>-/*
- * Copyright (C) 2016 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-namespace JSC {
-
-struct ThrowScopeLocation {
- ThrowScopeLocation() { }
- ThrowScopeLocation(const char* functionName, const char* file, unsigned line)
- : functionName(functionName)
- , file(file)
- , line(line)
- { }
-
- const char* functionName { nullptr };
- const char* file { nullptr };
- unsigned line { 0 };
-};
-
-} // namespace JSC
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VM.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/VM.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -894,4 +894,28 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // !ENABLE(JIT)
</span><span class="cx">
</span><ins>+#if ENABLE(EXCEPTION_SCOPE_VERIFICATION)
+void VM::verifyExceptionCheckNeedIsSatisfied(unsigned recursionDepth, ExceptionEventLocation& location)
+{
+ if (!m_verifyExceptionEvents)
+ return;
+
+ if (UNLIKELY(m_needExceptionCheck)) {
+ auto throwDepth = m_simulatedThrowPointRecursionDepth;
+ auto& throwLocation = m_simulatedThrowPointLocation;
+
+ dataLog(
+ "ERROR: Unchecked JS exception:\n"
+ " This scope can throw a JS exception: ", throwLocation, "\n"
+ " (ExceptionScope::m_recursionDepth was ", throwDepth, ")\n"
+ " But the exception was unchecked as of this scope: ", location, "\n"
+ " (ExceptionScope::m_recursionDepth was ", recursionDepth, ")\n"
+ "\n");
+ WTFReportBacktrace();
+
+ RELEASE_ASSERT(!m_needExceptionCheck);
+ }
+}
+#endif
+
</ins><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VM.h (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.h 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/VM.h 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "ConcurrentJITLock.h"
</span><span class="cx"> #include "ControlFlowProfiler.h"
</span><span class="cx"> #include "DateInstanceCache.h"
</span><ins>+#include "ExceptionEventLocation.h"
</ins><span class="cx"> #include "ExecutableAllocator.h"
</span><span class="cx"> #include "FunctionHasExecutedCache.h"
</span><span class="cx"> #include "Heap.h"
</span><span class="lines">@@ -47,7 +48,6 @@
</span><span class="cx"> #include "SmallStrings.h"
</span><span class="cx"> #include "SourceCode.h"
</span><span class="cx"> #include "Strong.h"
</span><del>-#include "ThrowScopeLocation.h"
</del><span class="cx"> #include "ThunkGenerators.h"
</span><span class="cx"> #include "TypedArrayController.h"
</span><span class="cx"> #include "VMEntryRecord.h"
</span><span class="lines">@@ -85,6 +85,7 @@
</span><span class="cx"> class CustomGetterSetter;
</span><span class="cx"> class ExecState;
</span><span class="cx"> class Exception;
</span><ins>+class ExceptionScope;
</ins><span class="cx"> class HandleStack;
</span><span class="cx"> class TypeProfiler;
</span><span class="cx"> class TypeProfilerLog;
</span><span class="lines">@@ -112,7 +113,6 @@
</span><span class="cx"> class RegExp;
</span><span class="cx"> #endif
</span><span class="cx"> class Symbol;
</span><del>-class ThrowScope;
</del><span class="cx"> class UnlinkedCodeBlock;
</span><span class="cx"> class UnlinkedEvalCodeBlock;
</span><span class="cx"> class UnlinkedFunctionExecutable;
</span><span class="lines">@@ -447,12 +447,10 @@
</span><span class="cx">
</span><span class="cx"> void restorePreviousException(Exception* exception) { setException(exception); }
</span><span class="cx">
</span><del>- void clearException() { m_exception = nullptr; }
</del><span class="cx"> void clearLastException() { m_lastException = nullptr; }
</span><span class="cx">
</span><span class="cx"> ExecState** addressOfCallFrameForCatch() { return &callFrameForCatch; }
</span><span class="cx">
</span><del>- Exception* exception() const { return m_exception; }
</del><span class="cx"> JSCell** addressOfException() { return reinterpret_cast<JSCell**>(&m_exception); }
</span><span class="cx">
</span><span class="cx"> Exception* lastException() const { return m_lastException; }
</span><span class="lines">@@ -648,6 +646,20 @@
</span><span class="cx"> m_exception = exception;
</span><span class="cx"> m_lastException = exception;
</span><span class="cx"> }
</span><ins>+ Exception* exception() const
+ {
+#if ENABLE(EXCEPTION_SCOPE_VERIFICATION)
+ m_needExceptionCheck = false;
+#endif
+ return m_exception;
+ }
+ void clearException()
+ {
+#if ENABLE(EXCEPTION_SCOPE_VERIFICATION)
+ m_needExceptionCheck = false;
+#endif
+ m_exception = nullptr;
+ }
</ins><span class="cx">
</span><span class="cx"> #if !ENABLE(JIT)
</span><span class="cx"> bool ensureStackCapacityForCLoop(Register* newTopOfStack);
</span><span class="lines">@@ -658,6 +670,10 @@
</span><span class="cx"> JS_EXPORT_PRIVATE JSValue throwException(ExecState*, JSValue);
</span><span class="cx"> JS_EXPORT_PRIVATE JSObject* throwException(ExecState*, JSObject*);
</span><span class="cx">
</span><ins>+#if ENABLE(EXCEPTION_SCOPE_VERIFICATION)
+ void verifyExceptionCheckNeedIsSatisfied(unsigned depth, ExceptionEventLocation&);
+#endif
+
</ins><span class="cx"> #if ENABLE(ASSEMBLER)
</span><span class="cx"> bool m_canUseAssembler;
</span><span class="cx"> #endif
</span><span class="lines">@@ -682,11 +698,14 @@
</span><span class="cx">
</span><span class="cx"> Exception* m_exception { nullptr };
</span><span class="cx"> Exception* m_lastException { nullptr };
</span><del>-#if ENABLE(THROW_SCOPE_VERIFICATION)
- ThrowScope* m_topThrowScope { nullptr };
- ThrowScopeLocation m_simulatedThrowPointLocation;
- unsigned m_simulatedThrowPointDepth { 0 };
</del><ins>+#if ENABLE(EXCEPTION_SCOPE_VERIFICATION)
+ ExceptionScope* m_topExceptionScope { nullptr };
+ ExceptionEventLocation m_simulatedThrowPointLocation;
+ unsigned m_simulatedThrowPointRecursionDepth { 0 };
</ins><span class="cx"> mutable bool m_needExceptionCheck { false };
</span><ins>+
+ // Disabled temporarily until all known verification failures are fixed.
+ bool m_verifyExceptionEvents { false };
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> bool m_failNextNewCodeBlock { false };
</span><span class="lines">@@ -712,6 +731,10 @@
</span><span class="cx"> std::unique_ptr<ShadowChicken> m_shadowChicken;
</span><span class="cx"> std::unique_ptr<BytecodeIntrinsicRegistry> m_bytecodeIntrinsicRegistry;
</span><span class="cx">
</span><ins>+ // Friends for exception checking purpose only.
+ friend class Heap;
+ friend class CatchScope;
+ friend class ExceptionScope;
</ins><span class="cx"> friend class ThrowScope;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeWeakMapConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/WeakMapConstructor.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/WeakMapConstructor.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/WeakMapConstructor.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx">
</span><span class="cx"> JSGlobalObject* globalObject = asInternalFunction(exec->callee())->globalObject();
</span><span class="cx"> Structure* weakMapStructure = InternalFunction::createSubclassStructure(exec, exec->newTarget(), globalObject->weakMapStructure());
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> JSWeakMap* weakMap = JSWeakMap::create(exec, weakMapStructure);
</span><span class="cx"> JSValue iterable = exec->argument(0);
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> return JSValue::encode(weakMap);
</span><span class="cx">
</span><span class="cx"> JSValue adderFunction = weakMap->JSObject::get(exec, exec->propertyNames().set);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> CallData adderFunctionCallData;
</span><span class="lines">@@ -76,6 +76,7 @@
</span><span class="cx"> return JSValue::encode(throwTypeError(exec, scope));
</span><span class="cx">
</span><span class="cx"> forEachInIterable(exec, iterable, [&](VM& vm, ExecState* exec, JSValue nextItem) {
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> if (!nextItem.isObject()) {
</span><span class="cx"> throwTypeError(exec, scope);
</span><span class="cx"> return;
</span><span class="lines">@@ -82,11 +83,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue key = nextItem.get(exec, static_cast<unsigned>(0));
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> JSValue value = nextItem.get(exec, static_cast<unsigned>(1));
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> MarkedArgumentBuffer arguments;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeWeakSetConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/WeakSetConstructor.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/WeakSetConstructor.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/runtime/WeakSetConstructor.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx">
</span><span class="cx"> JSGlobalObject* globalObject = asInternalFunction(exec->callee())->globalObject();
</span><span class="cx"> Structure* weakSetStructure = InternalFunction::createSubclassStructure(exec, exec->newTarget(), globalObject->weakSetStructure());
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> JSWeakSet* weakSet = JSWeakSet::create(exec, weakSetStructure);
</span><span class="cx"> JSValue iterable = exec->argument(0);
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> return JSValue::encode(weakSet);
</span><span class="cx">
</span><span class="cx"> JSValue adderFunction = weakSet->JSObject::get(exec, exec->propertyNames().add);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> CallData adderFunctionCallData;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretoolsJSDollarVMPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tools/JSDollarVMPrototype.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tools/JSDollarVMPrototype.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/JavaScriptCore/tools/JSDollarVMPrototype.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -307,9 +307,10 @@
</span><span class="cx">
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL functionPrint(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(exec->vm());
</ins><span class="cx"> for (unsigned i = 0; i < exec->argumentCount(); ++i) {
</span><span class="cx"> String argStr = exec->uncheckedArgument(i).toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> dataLog(argStr);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WTF/ChangeLog 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-09-07 Mark Lam <mark.lam@apple.com>
+
+ Add CatchScope and force all exception checks to be via ThrowScope or CatchScope.
+ https://bugs.webkit.org/show_bug.cgi?id=161498
+
+ Reviewed by Geoffrey Garen.
+
+ * wtf/Platform.h:
+
</ins><span class="cx"> 2016-09-07 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> [Streams API] Separate compile flag for ReadableStream and WritableStream
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Platform.h 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WTF/wtf/Platform.h 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -918,8 +918,8 @@
</span><span class="cx"> #define ENABLE_MASM_PROBE 0
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#ifndef ENABLE_THROW_SCOPE_VERIFICATION
-#define ENABLE_THROW_SCOPE_VERIFICATION (!defined(NDEBUG))
</del><ins>+#ifndef ENABLE_EXCEPTION_SCOPE_VERIFICATION
+#define ENABLE_EXCEPTION_SCOPE_VERIFICATION (!defined(NDEBUG))
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> /* Pick which allocator to use; we only need an executable allocator if the assembler is compiled in.
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/ChangeLog 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -1,3 +1,515 @@
</span><ins>+2016-09-07 Mark Lam <mark.lam@apple.com>
+
+ Add CatchScope and force all exception checks to be via ThrowScope or CatchScope.
+ https://bugs.webkit.org/show_bug.cgi?id=161498
+
+ Reviewed by Geoffrey Garen.
+
+ No new test because there is no behavior change in general except for 1 bug fix.
+ That bug is already caught by existing tests with the introduction of the CatchScope.
+
+ Fixes a bug in JSEventListener::handleEvent() where the exception thrown from
+ a failed attempt to get the handleEvent callback is not handled.
+
+ * ForwardingHeaders/runtime/CatchScope.h: Added.
+ * Modules/encryptedmedia/CDMSessionClearKey.cpp:
+ (WebCore::CDMSessionClearKey::update):
+ * Modules/indexeddb/IDBObjectStore.cpp:
+ (WebCore::IDBObjectStore::putOrAdd):
+ * Modules/indexeddb/server/UniqueIDBDatabase.cpp:
+ (WebCore::IDBServer::UniqueIDBDatabase::performPutOrAdd):
+ * Modules/mediastream/SDPProcessor.cpp:
+ (WebCore::SDPProcessor::callScript):
+ * Modules/plugins/QuickTimePluginReplacement.mm:
+ (WebCore::QuickTimePluginReplacement::ensureReplacementScriptInjected):
+ (WebCore::QuickTimePluginReplacement::installReplacement):
+ * bindings/js/ArrayValue.cpp:
+ (WebCore::ArrayValue::get):
+ * bindings/js/Dictionary.cpp:
+ (WebCore::Dictionary::getOwnPropertiesAsStringHashMap):
+ * bindings/js/IDBBindingUtilities.cpp:
+ (WebCore::toJS):
+ * bindings/js/JSApplePaySessionCustom.cpp:
+ (WebCore::JSApplePaySession::completeShippingMethodSelection):
+ (WebCore::JSApplePaySession::completeShippingContactSelection):
+ (WebCore::JSApplePaySession::completePaymentMethodSelection):
+ * bindings/js/JSAudioTrackCustom.cpp:
+ (WebCore::JSAudioTrack::setKind):
+ (WebCore::JSAudioTrack::setLanguage):
+ * bindings/js/JSBlobCustom.cpp:
+ (WebCore::constructJSBlob):
+ * bindings/js/JSCSSStyleDeclarationCustom.cpp:
+ (WebCore::JSCSSStyleDeclaration::getPropertyCSSValue):
+ * bindings/js/JSCommandLineAPIHostCustom.cpp:
+ (WebCore::getJSListenerFunctions):
+ * bindings/js/JSCryptoAlgorithmDictionary.cpp:
+ (WebCore::JSCryptoAlgorithmDictionary::getAlgorithmIdentifier):
+ (WebCore::getHashAlgorithm):
+ (WebCore::createAesCbcParams):
+ (WebCore::createAesKeyGenParams):
+ (WebCore::createHmacParams):
+ (WebCore::createHmacKeyParams):
+ (WebCore::createRsaKeyGenParams):
+ (WebCore::createRsaOaepParams):
+ (WebCore::createRsaSsaParams):
+ * bindings/js/JSCryptoKeySerializationJWK.cpp:
+ (WebCore::getJSArrayFromJSON):
+ (WebCore::getStringFromJSON):
+ (WebCore::getBooleanFromJSON):
+ (WebCore::JSCryptoKeySerializationJWK::JSCryptoKeySerializationJWK):
+ (WebCore::JSCryptoKeySerializationJWK::reconcileUsages):
+ (WebCore::JSCryptoKeySerializationJWK::keyDataOctetSequence):
+ (WebCore::JSCryptoKeySerializationJWK::keyDataRSAComponents):
+ (WebCore::JSCryptoKeySerializationJWK::keyData):
+ (WebCore::buildJSONForRSAComponents):
+ (WebCore::addUsagesToJSON):
+ (WebCore::JSCryptoKeySerializationJWK::serialize):
+ * bindings/js/JSCustomElementInterface.cpp:
+ (WebCore::JSCustomElementInterface::constructElement):
+ (WebCore::constructCustomElementSynchronously):
+ (WebCore::JSCustomElementInterface::upgradeElement):
+ * bindings/js/JSCustomElementRegistryCustom.cpp:
+ (WebCore::getCustomElementCallback):
+ (WebCore::JSCustomElementRegistry::define):
+ (WebCore::whenDefinedPromise):
+ (WebCore::JSCustomElementRegistry::whenDefined):
+ * bindings/js/JSDOMBinding.cpp:
+ (WebCore::valueToUSVString):
+ (WebCore::reportException):
+ (WebCore::reportCurrentException):
+ (WebCore::setDOMException):
+ (WebCore::hasIteratorMethod):
+ (WebCore::toSmallerInt):
+ (WebCore::toSmallerUInt):
+ (WebCore::toInt32EnforceRange):
+ (WebCore::toUInt32EnforceRange):
+ (WebCore::toInt64EnforceRange):
+ (WebCore::toUInt64EnforceRange):
+ (WebCore::throwNotSupportedError):
+ (WebCore::throwInvalidStateError):
+ (WebCore::throwSecurityError):
+ * bindings/js/JSDOMBinding.h:
+ (WebCore::toJSSequence):
+ (WebCore::toJS):
+ (WebCore::jsFrozenArray):
+ (WebCore::NativeValueTraits<String>::nativeValue):
+ (WebCore::NativeValueTraits<unsigned>::nativeValue):
+ (WebCore::NativeValueTraits<float>::nativeValue):
+ (WebCore::NativeValueTraits<double>::nativeValue):
+ (WebCore::toNativeArray):
+ * bindings/js/JSDOMGlobalObject.cpp:
+ (WebCore::makeThisTypeErrorForBuiltins):
+ (WebCore::makeGetterTypeErrorForBuiltins):
+ * bindings/js/JSDOMGlobalObjectTask.cpp:
+ * bindings/js/JSDOMIterator.h:
+ (WebCore::iteratorForEach):
+ * bindings/js/JSDOMPromise.cpp:
+ (WebCore::rejectPromiseWithExceptionIfAny):
+ * bindings/js/JSDOMPromise.h:
+ (WebCore::callPromiseFunction):
+ * bindings/js/JSDOMStringMapCustom.cpp:
+ (WebCore::JSDOMStringMap::putDelegate):
+ * bindings/js/JSDOMWindowBase.cpp:
+ (WebCore::JSDOMWindowMicrotaskCallback::call):
+ * bindings/js/JSDOMWindowCustom.cpp:
+ (WebCore::JSDOMWindow::setLocation):
+ (WebCore::JSDOMWindow::open):
+ (WebCore::JSDOMWindow::showModalDialog):
+ (WebCore::handlePostMessage):
+ (WebCore::JSDOMWindow::setTimeout):
+ (WebCore::JSDOMWindow::setInterval):
+ * bindings/js/JSDataCueCustom.cpp:
+ (WebCore::constructJSDataCue):
+ * bindings/js/JSDeviceMotionEventCustom.cpp:
+ (WebCore::readAccelerationArgument):
+ (WebCore::readRotationRateArgument):
+ (WebCore::JSDeviceMotionEvent::initDeviceMotionEvent):
+ * bindings/js/JSDictionary.cpp:
+ (WebCore::JSDictionary::tryGetProperty):
+ (WebCore::JSDictionary::convertValue):
+ * bindings/js/JSDictionary.h:
+ (WebCore::JSDictionary::tryGetPropertyAndResult):
+ * bindings/js/JSDocumentCustom.cpp:
+ (WebCore::JSDocument::getCSSCanvasContext):
+ * bindings/js/JSEventListener.cpp:
+ (WebCore::JSEventListener::handleEvent):
+ * bindings/js/JSFileCustom.cpp:
+ (WebCore::constructJSFile):
+ * bindings/js/JSGeolocationCustom.cpp:
+ (WebCore::createPositionOptions):
+ (WebCore::JSGeolocation::getCurrentPosition):
+ (WebCore::JSGeolocation::watchPosition):
+ * bindings/js/JSHTMLAllCollectionCustom.cpp:
+ (WebCore::callHTMLAllCollection):
+ * bindings/js/JSHTMLCanvasElementCustom.cpp:
+ (WebCore::get3DContextAttributes):
+ (WebCore::JSHTMLCanvasElement::getContext):
+ (WebCore::JSHTMLCanvasElement::probablySupportsContext):
+ * bindings/js/JSHTMLElementCustom.cpp:
+ (WebCore::constructJSHTMLElement):
+ * bindings/js/JSHistoryCustom.cpp:
+ (WebCore::JSHistory::pushState):
+ (WebCore::JSHistory::replaceState):
+ * bindings/js/JSIDBDatabaseCustom.cpp:
+ (WebCore::JSIDBDatabase::createObjectStore):
+ * bindings/js/JSLazyEventListener.cpp:
+ (WebCore::JSLazyEventListener::initializeJSFunction):
+ * bindings/js/JSMainThreadExecState.h:
+ (WebCore::JSMainThreadExecState::linkAndEvaluateModule):
+ (WebCore::JSMainThreadExecState::~JSMainThreadExecState):
+ * bindings/js/JSMessageEventCustom.cpp:
+ (WebCore::handleInitMessageEvent):
+ * bindings/js/JSMessagePortCustom.cpp:
+ (WebCore::fillMessagePortArray):
+ * bindings/js/JSMessagePortCustom.h:
+ (WebCore::handlePostMessage):
+ * bindings/js/JSMockContentFilterSettingsCustom.cpp:
+ (WebCore::JSMockContentFilterSettings::setDecisionPoint):
+ (WebCore::toDecision):
+ (WebCore::JSMockContentFilterSettings::setDecision):
+ (WebCore::JSMockContentFilterSettings::setUnblockRequestDecision):
+ * bindings/js/JSNodeFilterCustom.cpp:
+ (WebCore::JSNodeFilter::acceptNode):
+ * bindings/js/JSNodeOrString.cpp:
+ (WebCore::toNodeOrStringVector):
+ * bindings/js/JSSQLTransactionCustom.cpp:
+ (WebCore::JSSQLTransaction::executeSql):
+ * bindings/js/JSSVGLengthCustom.cpp:
+ (WebCore::JSSVGLength::convertToSpecifiedUnits):
+ * bindings/js/JSStorageCustom.cpp:
+ (WebCore::JSStorage::getOwnPropertyNames):
+ (WebCore::JSStorage::putDelegate):
+ * bindings/js/JSTextTrackCustom.cpp:
+ (WebCore::JSTextTrack::setLanguage):
+ * bindings/js/JSVideoTrackCustom.cpp:
+ (WebCore::JSVideoTrack::setKind):
+ (WebCore::JSVideoTrack::setLanguage):
+ * bindings/js/JSWebGL2RenderingContextCustom.cpp:
+ (WebCore::JSWebGL2RenderingContext::getIndexedParameter):
+ * bindings/js/JSWebGLRenderingContextBaseCustom.cpp:
+ (WebCore::getObjectParameter):
+ (WebCore::JSWebGLRenderingContextBase::getExtension):
+ (WebCore::JSWebGLRenderingContextBase::getFramebufferAttachmentParameter):
+ (WebCore::JSWebGLRenderingContextBase::getParameter):
+ (WebCore::JSWebGLRenderingContextBase::getProgramParameter):
+ (WebCore::JSWebGLRenderingContextBase::getShaderParameter):
+ (WebCore::toVector):
+ (WebCore::dataFunctionf):
+ (WebCore::dataFunctionMatrix):
+ * bindings/js/JSWebKitSubtleCryptoCustom.cpp:
+ (WebCore::createAlgorithmFromJSValue):
+ (WebCore::cryptoKeyFormatFromJSValue):
+ (WebCore::cryptoKeyUsagesFromJSValue):
+ (WebCore::JSWebKitSubtleCrypto::encrypt):
+ (WebCore::JSWebKitSubtleCrypto::decrypt):
+ (WebCore::JSWebKitSubtleCrypto::sign):
+ (WebCore::JSWebKitSubtleCrypto::verify):
+ (WebCore::JSWebKitSubtleCrypto::digest):
+ (WebCore::JSWebKitSubtleCrypto::generateKey):
+ (WebCore::importKey):
+ (WebCore::JSWebKitSubtleCrypto::importKey):
+ (WebCore::exportKey):
+ (WebCore::JSWebKitSubtleCrypto::exportKey):
+ (WebCore::JSWebKitSubtleCrypto::wrapKey):
+ (WebCore::JSWebKitSubtleCrypto::unwrapKey):
+ * bindings/js/JSWorkerCustom.cpp:
+ (WebCore::constructJSWorker):
+ * bindings/js/JSWorkerGlobalScopeCustom.cpp:
+ (WebCore::JSWorkerGlobalScope::importScripts):
+ (WebCore::JSWorkerGlobalScope::setTimeout):
+ (WebCore::JSWorkerGlobalScope::setInterval):
+ * bindings/js/ReadableStreamDefaultController.cpp:
+ (WebCore::ReadableStreamDefaultController::invoke):
+ (WebCore::ReadableStreamDefaultController::isControlledReadableStreamLocked):
+ * bindings/js/ReadableStreamDefaultController.h:
+ (WebCore::ReadableStreamDefaultController::enqueue):
+ * bindings/js/ScheduledAction.cpp:
+ (WebCore::ScheduledAction::create):
+ * bindings/js/ScriptGlobalObject.cpp:
+ (WebCore::ScriptGlobalObject::set):
+ * bindings/js/SerializedScriptValue.cpp:
+ (WebCore::CloneBase::shouldTerminate):
+ (WebCore::CloneDeserializer::deserialize):
+ (WebCore::SerializedScriptValue::create):
+ (WebCore::SerializedScriptValue::deserialize):
+ * bindings/js/WorkerScriptController.cpp:
+ (WebCore::WorkerScriptController::evaluate):
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateDictionaryImplementationContent):
+ (GenerateImplementation):
+ (GenerateParametersCheck):
+ (GenerateImplementationFunctionCall):
+ (GenerateConstructorDefinition):
+ * bindings/scripts/test/JS/JSTestActiveDOMObject.cpp:
+ (WebCore::jsTestActiveDOMObjectPrototypeFunctionPostMessage):
+ * bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp:
+ (WebCore::jsTestCustomNamedGetterPrototypeFunctionAnotherFunction):
+ * bindings/scripts/test/JS/JSTestEventConstructor.cpp:
+ (WebCore::JSTestEventConstructorConstructor::construct):
+ * bindings/scripts/test/JS/JSTestEventTarget.cpp:
+ (WebCore::jsTestEventTargetPrototypeFunctionItem):
+ * bindings/scripts/test/JS/JSTestGlobalObject.cpp:
+ (WebCore::setJSTestGlobalObjectRegularAttribute):
+ (WebCore::setJSTestGlobalObjectPublicAndPrivateAttribute):
+ (WebCore::setJSTestGlobalObjectPublicAndPrivateConditionalAttribute):
+ (WebCore::setJSTestGlobalObjectEnabledAtRuntimeAttribute):
+ (WebCore::jsTestGlobalObjectInstanceFunctionRegularOperation):
+ (WebCore::jsTestGlobalObjectInstanceFunctionEnabledAtRuntimeOperation1):
+ (WebCore::jsTestGlobalObjectInstanceFunctionEnabledAtRuntimeOperation2):
+ * bindings/scripts/test/JS/JSTestInterface.cpp:
+ (WebCore::JSTestInterfaceConstructor::construct):
+ (WebCore::setJSTestInterfaceConstructorImplementsStaticAttr):
+ (WebCore::setJSTestInterfaceImplementsStr2):
+ (WebCore::setJSTestInterfaceImplementsStr3):
+ (WebCore::setJSTestInterfaceImplementsNode):
+ (WebCore::setJSTestInterfaceConstructorSupplementalStaticAttr):
+ (WebCore::setJSTestInterfaceSupplementalStr2):
+ (WebCore::setJSTestInterfaceSupplementalStr3):
+ (WebCore::setJSTestInterfaceSupplementalNode):
+ (WebCore::jsTestInterfacePrototypeFunctionImplementsMethod2):
+ (WebCore::jsTestInterfacePrototypeFunctionSupplementalMethod2):
+ * bindings/scripts/test/JS/JSTestJSBuiltinConstructor.cpp:
+ (WebCore::setJSTestJSBuiltinConstructorTestAttributeRWCustom):
+ * bindings/scripts/test/JS/JSTestNamedConstructor.cpp:
+ (WebCore::JSTestNamedConstructorNamedConstructor::construct):
+ * bindings/scripts/test/JS/JSTestNode.cpp:
+ (WebCore::setJSTestNodeName):
+ * bindings/scripts/test/JS/JSTestNondeterministic.cpp:
+ (WebCore::setJSTestNondeterministicNondeterministicWriteableAttr):
+ (WebCore::setJSTestNondeterministicNondeterministicExceptionAttr):
+ (WebCore::setJSTestNondeterministicNondeterministicGetterExceptionAttr):
+ (WebCore::setJSTestNondeterministicNondeterministicSetterExceptionAttr):
+ * bindings/scripts/test/JS/JSTestObj.cpp:
+ (WebCore::convertDictionary<TestObj::Dictionary>):
+ (WebCore::convertDictionary<TestObj::DictionaryThatShouldNotTolerateNull>):
+ (WebCore::convertDictionary<TestObj::DictionaryThatShouldTolerateNull>):
+ (WebCore::convertDictionary<AlternateDictionaryName>):
+ (WebCore::setJSTestObjConstructorStaticStringAttr):
+ (WebCore::setJSTestObjTestSubObjEnabledBySettingConstructor):
+ (WebCore::setJSTestObjEnumAttr):
+ (WebCore::setJSTestObjByteAttr):
+ (WebCore::setJSTestObjOctetAttr):
+ (WebCore::setJSTestObjShortAttr):
+ (WebCore::setJSTestObjClampedShortAttr):
+ (WebCore::setJSTestObjEnforceRangeShortAttr):
+ (WebCore::setJSTestObjUnsignedShortAttr):
+ (WebCore::setJSTestObjLongAttr):
+ (WebCore::setJSTestObjLongLongAttr):
+ (WebCore::setJSTestObjUnsignedLongLongAttr):
+ (WebCore::setJSTestObjStringAttr):
+ (WebCore::setJSTestObjUsvstringAttr):
+ (WebCore::setJSTestObjTestObjAttr):
+ (WebCore::setJSTestObjTestNullableObjAttr):
+ (WebCore::setJSTestObjLenientTestObjAttr):
+ (WebCore::setJSTestObjStringAttrTreatingNullAsEmptyString):
+ (WebCore::setJSTestObjUsvstringAttrTreatingNullAsEmptyString):
+ (WebCore::setJSTestObjImplementationEnumAttr):
+ (WebCore::setJSTestObjXMLObjAttr):
+ (WebCore::setJSTestObjCreate):
+ (WebCore::setJSTestObjReflectedStringAttr):
+ (WebCore::setJSTestObjReflectedUSVStringAttr):
+ (WebCore::setJSTestObjReflectedIntegralAttr):
+ (WebCore::setJSTestObjReflectedUnsignedIntegralAttr):
+ (WebCore::setJSTestObjReflectedBooleanAttr):
+ (WebCore::setJSTestObjReflectedURLAttr):
+ (WebCore::setJSTestObjReflectedUSVURLAttr):
+ (WebCore::setJSTestObjReflectedCustomIntegralAttr):
+ (WebCore::setJSTestObjReflectedCustomBooleanAttr):
+ (WebCore::setJSTestObjReflectedCustomURLAttr):
+ (WebCore::setJSTestObjEnabledAtRuntimeAttribute):
+ (WebCore::setJSTestObjTypedArrayAttr):
+ (WebCore::setJSTestObjAttrWithGetterException):
+ (WebCore::setJSTestObjAttrWithGetterExceptionWithMessage):
+ (WebCore::setJSTestObjAttrWithSetterException):
+ (WebCore::setJSTestObjAttrWithSetterExceptionWithMessage):
+ (WebCore::setJSTestObjStringAttrWithGetterException):
+ (WebCore::setJSTestObjStringAttrWithSetterException):
+ (WebCore::setJSTestObjCustomAttr):
+ (WebCore::setJSTestObjOnfoo):
+ (WebCore::setJSTestObjOnwebkitfoo):
+ (WebCore::setJSTestObjWithScriptStateAttribute):
+ (WebCore::setJSTestObjWithCallWithAndSetterCallWithAttribute):
+ (WebCore::setJSTestObjWithScriptExecutionContextAttribute):
+ (WebCore::setJSTestObjWithScriptStateAttributeRaises):
+ (WebCore::setJSTestObjWithScriptExecutionContextAttributeRaises):
+ (WebCore::setJSTestObjWithScriptExecutionContextAndScriptStateAttribute):
+ (WebCore::setJSTestObjWithScriptExecutionContextAndScriptStateAttributeRaises):
+ (WebCore::setJSTestObjWithScriptExecutionContextAndScriptStateWithSpacesAttribute):
+ (WebCore::setJSTestObjWithScriptArgumentsAndCallStackAttribute):
+ (WebCore::setJSTestObjConditionalAttr1):
+ (WebCore::setJSTestObjConditionalAttr2):
+ (WebCore::setJSTestObjConditionalAttr3):
+ (WebCore::setJSTestObjConditionalAttr4Constructor):
+ (WebCore::setJSTestObjConditionalAttr5Constructor):
+ (WebCore::setJSTestObjConditionalAttr6Constructor):
+ (WebCore::setJSTestObjAnyAttribute):
+ (WebCore::setJSTestObjMutablePoint):
+ (WebCore::setJSTestObjImmutablePoint):
+ (WebCore::setJSTestObjStrawberry):
+ (WebCore::setJSTestObjId):
+ (WebCore::setJSTestObjReplaceableAttribute):
+ (WebCore::setJSTestObjNullableLongSettableAttribute):
+ (WebCore::setJSTestObjNullableStringSettableAttribute):
+ (WebCore::setJSTestObjNullableUSVStringSettableAttribute):
+ (WebCore::setJSTestObjNullableStringValue):
+ (WebCore::setJSTestObjAttributeWithReservedEnumType):
+ (WebCore::setJSTestObjPutForwardsAttribute):
+ (WebCore::setJSTestObjPutForwardsNullableAttribute):
+ (WebCore::setJSTestObjStringifierAttribute):
+ (WebCore::jsTestObjPrototypeFunctionEnabledAtRuntimeOperation1):
+ (WebCore::jsTestObjPrototypeFunctionEnabledAtRuntimeOperation2):
+ (WebCore::jsTestObjPrototypeFunctionVoidMethodWithArgs):
+ (WebCore::jsTestObjPrototypeFunctionByteMethodWithArgs):
+ (WebCore::jsTestObjPrototypeFunctionOctetMethodWithArgs):
+ (WebCore::jsTestObjPrototypeFunctionLongMethodWithArgs):
+ (WebCore::jsTestObjPrototypeFunctionObjMethodWithArgs):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithArgTreatingNullAsEmptyString):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithXPathNSResolverParameter):
+ (WebCore::jsTestObjPrototypeFunctionNullableStringSpecialMethod):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithEnumArg):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalEnumArg):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalEnumArgAndDefaultValue):
+ (WebCore::jsTestObjPrototypeFunctionMethodThatRequiresAllArgsAndThrows):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithUSVStringArg):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithNullableUSVStringArg):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithUSVStringArgTreatingNullAsEmptyString):
+ (WebCore::jsTestObjPrototypeFunctionSerializedValue):
+ (WebCore::jsTestObjPrototypeFunctionPrivateMethod):
+ (WebCore::jsTestObjPrototypeFunctionPublicAndPrivateMethod):
+ (WebCore::jsTestObjPrototypeFunctionAddEventListener):
+ (WebCore::jsTestObjPrototypeFunctionRemoveEventListener):
+ (WebCore::jsTestObjPrototypeFunctionWithScriptStateObj):
+ (WebCore::jsTestObjPrototypeFunctionWithScriptStateObjException):
+ (WebCore::jsTestObjPrototypeFunctionWithScriptExecutionContextAndScriptStateObjException):
+ (WebCore::jsTestObjPrototypeFunctionWithScriptExecutionContextAndScriptStateWithSpaces):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalArg):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalArgAndDefaultValue):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithNonOptionalArgAndOptionalArg):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithNonOptionalArgAndTwoOptionalArgs):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalString):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalUSVString):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalAtomicString):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalStringAndDefaultValue):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalAtomicStringAndDefaultValue):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalStringIsNull):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalStringIsUndefined):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalAtomicStringIsNull):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalStringIsEmptyString):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalUSVStringIsEmptyString):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalAtomicStringIsEmptyString):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalDoubleIsNaN):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalFloatIsNaN):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalLongLong):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalLongLongIsZero):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalUnsignedLongLong):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalUnsignedLongLongIsZero):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalSequence):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalSequenceIsEmpty):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalBoolean):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalBooleanIsFalse):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalXPathNSResolver):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithNonCallbackArgAndCallbackArg):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithNonCallbackArgAndCallbackFunctionArg):
+ (WebCore::jsTestObjPrototypeFunctionOverloadedMethod1):
+ (WebCore::jsTestObjPrototypeFunctionOverloadedMethod2):
+ (WebCore::jsTestObjPrototypeFunctionOverloadedMethod3):
+ (WebCore::jsTestObjPrototypeFunctionOverloadedMethod4):
+ (WebCore::jsTestObjPrototypeFunctionOverloadedMethod7):
+ (WebCore::jsTestObjPrototypeFunctionOverloadedMethod9):
+ (WebCore::jsTestObjPrototypeFunctionOverloadedMethod10):
+ (WebCore::jsTestObjPrototypeFunctionOverloadedMethod11):
+ (WebCore::jsTestObjPrototypeFunctionOverloadedMethodWithOptionalParameter1):
+ (WebCore::jsTestObjPrototypeFunctionOverloadedMethodWithOptionalParameter2):
+ (WebCore::jsTestObjConstructorFunctionClassMethodWithOptional):
+ (WebCore::jsTestObjConstructorFunctionOverloadedMethod11):
+ (WebCore::jsTestObjConstructorFunctionOverloadedMethod12):
+ (WebCore::jsTestObjPrototypeFunctionClassMethodWithClamp):
+ (WebCore::jsTestObjPrototypeFunctionClassMethodWithEnforceRange):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithUnsignedLongSequence):
+ (WebCore::jsTestObjPrototypeFunctionStringArrayFunction):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithAndWithoutNullableSequence):
+ (WebCore::jsTestObjPrototypeFunctionGetElementById):
+ (WebCore::jsTestObjPrototypeFunctionConvert3):
+ (WebCore::jsTestObjPrototypeFunctionConvert4):
+ (WebCore::jsTestObjPrototypeFunctionVariadicStringMethod):
+ (WebCore::jsTestObjPrototypeFunctionVariadicDoubleMethod):
+ (WebCore::jsTestObjPrototypeFunctionAny):
+ (WebCore::jsTestObjPrototypeFunctionTestPromiseFunctionWithFloatArgumentPromise):
+ (WebCore::jsTestObjPrototypeFunctionTestPromiseFunctionWithOptionalIntArgumentPromise):
+ (WebCore::jsTestObjPrototypeFunctionTestPromiseOverloadedFunction1Promise):
+ (WebCore::jsTestObjPrototypeFunctionConditionalOverload1):
+ (WebCore::jsTestObjPrototypeFunctionConditionalOverload2):
+ (WebCore::jsTestObjPrototypeFunctionSingleConditionalOverload1):
+ (WebCore::jsTestObjPrototypeFunctionSingleConditionalOverload2):
+ (WebCore::jsTestObjPrototypeFunctionAttachShadowRoot):
+ * bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp:
+ (WebCore::constructJSTestOverloadedConstructors1):
+ (WebCore::constructJSTestOverloadedConstructors2):
+ (WebCore::constructJSTestOverloadedConstructors4):
+ (WebCore::constructJSTestOverloadedConstructors5):
+ * bindings/scripts/test/JS/JSTestOverloadedConstructorsWithSequence.cpp:
+ (WebCore::constructJSTestOverloadedConstructorsWithSequence1):
+ (WebCore::constructJSTestOverloadedConstructorsWithSequence2):
+ * bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp:
+ (WebCore::jsTestOverrideBuiltinsPrototypeFunctionNamedItem):
+ * bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp:
+ (WebCore::setJSTestSerializedScriptValueInterfaceValue):
+ (WebCore::setJSTestSerializedScriptValueInterfaceCachedValue):
+ * bindings/scripts/test/JS/JSTestTypedefs.cpp:
+ (WebCore::JSTestTypedefsConstructor::construct):
+ (WebCore::setJSTestTypedefsUnsignedLongLongAttr):
+ (WebCore::setJSTestTypedefsImmutableSerializedScriptValue):
+ (WebCore::setJSTestTypedefsAttrWithGetterException):
+ (WebCore::setJSTestTypedefsAttrWithSetterException):
+ (WebCore::setJSTestTypedefsStringAttrWithGetterException):
+ (WebCore::setJSTestTypedefsStringAttrWithSetterException):
+ (WebCore::jsTestTypedefsPrototypeFunctionFunc):
+ (WebCore::jsTestTypedefsPrototypeFunctionSetShadow):
+ (WebCore::jsTestTypedefsPrototypeFunctionMethodWithSequenceArg):
+ (WebCore::jsTestTypedefsPrototypeFunctionNullableSequenceArg):
+ (WebCore::jsTestTypedefsPrototypeFunctionFuncWithClamp):
+ (WebCore::jsTestTypedefsPrototypeFunctionStringSequenceFunction):
+ (WebCore::jsTestTypedefsPrototypeFunctionStringSequenceFunction2):
+ (WebCore::jsTestTypedefsPrototypeFunctionCallWithSequenceThatRequiresInclude):
+ * bridge/NP_jsobject.cpp:
+ (_NPN_InvokeDefault):
+ (_NPN_Invoke):
+ (_NPN_Evaluate):
+ (_NPN_GetProperty):
+ (_NPN_SetProperty):
+ (_NPN_RemoveProperty):
+ (_NPN_HasProperty):
+ (_NPN_HasMethod):
+ (_NPN_Enumerate):
+ (_NPN_Construct):
+ * bridge/c/c_instance.cpp:
+ (JSC::Bindings::CInstance::moveGlobalExceptionToExecState):
+ * bridge/objc/WebScriptObject.mm:
+ (WebCore::addExceptionToConsole):
+ (-[WebScriptObject callWebScriptMethod:withArguments:]):
+ (-[WebScriptObject evaluateWebScript:]):
+ (-[WebScriptObject setValue:forKey:]):
+ (-[WebScriptObject valueForKey:]):
+ (-[WebScriptObject removeWebScriptKey:]):
+ (-[WebScriptObject hasWebScriptKey:]):
+ (-[WebScriptObject webScriptValueAtIndex:]):
+ (-[WebScriptObject setWebScriptValueAtIndex:value:]):
+ * contentextensions/ContentExtensionParser.cpp:
+ (WebCore::ContentExtensions::getDomainList):
+ (WebCore::ContentExtensions::getTypeFlags):
+ (WebCore::ContentExtensions::loadTrigger):
+ (WebCore::ContentExtensions::loadAction):
+ (WebCore::ContentExtensions::loadEncodedRules):
+ * html/HTMLMediaElement.cpp:
+ (WebCore::controllerJSValue):
+ (WebCore::HTMLMediaElement::updateCaptionContainer):
+ (WebCore::HTMLMediaElement::ensureMediaControlsInjectedScript):
+ (WebCore::HTMLMediaElement::didAddUserAgentShadowRoot):
+ (WebCore::HTMLMediaElement::updateMediaControlsAfterPresentationModeChange):
+ (WebCore::HTMLMediaElement::getCurrentMediaControlsStatus):
+ * html/HTMLPlugInImageElement.cpp:
+ (WebCore::HTMLPlugInImageElement::didAddUserAgentShadowRoot):
+
</ins><span class="cx"> 2016-09-07 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix handling of negative radius in HTMLAreaElement's coords when in circle state
</span></span></pre></div>
<a id="trunkSourceWebCoreForwardingHeadersruntimeCatchScopeh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/ForwardingHeaders/runtime/CatchScope.h (0 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ForwardingHeaders/runtime/CatchScope.h (rev 0)
+++ trunk/Source/WebCore/ForwardingHeaders/runtime/CatchScope.h 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+#ifndef WebCore_FWD_CatchScope_h
+#define WebCore_FWD_CatchScope_h
+#include <JavaScriptCore/CatchScope.h>
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaCDMSessionClearKeycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/CDMSessionClearKey.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/CDMSessionClearKey.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/Modules/encryptedmedia/CDMSessionClearKey.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -111,12 +111,13 @@
</span><span class="cx">
</span><span class="cx"> VM& vm = clearKeyVM();
</span><span class="cx"> JSLockHolder lock(vm);
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSGlobalObject* globalObject = JSGlobalObject::create(vm, JSGlobalObject::createStructure(vm, jsNull()));
</span><span class="cx"> ExecState* exec = globalObject->globalExec();
</span><span class="cx">
</span><span class="cx"> JSLockHolder locker(clearKeyVM());
</span><span class="cx"> JSValue keysDataObject = JSONParse(exec, rawKeysString);
</span><del>- if (exec->hadException() || !keysDataObject) {
</del><ins>+ if (scope.exception() || !keysDataObject) {
</ins><span class="cx"> LOG(Media, "CDMSessionClearKey::update(%p) - failed: invalid JSON", this);
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBObjectStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -236,6 +236,9 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<IDBRequest> IDBObjectStore::putOrAdd(ExecState& state, JSValue value, RefPtr<IDBKey> key, IndexedDB::ObjectStoreOverwriteMode overwriteMode, InlineKeyCheck inlineKeyCheck, ExceptionCodeWithMessage& ec)
</span><span class="cx"> {
</span><ins>+ VM& vm = state.vm();
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
</ins><span class="cx"> LOG(IndexedDB, "IDBObjectStore::putOrAdd");
</span><span class="cx"> ASSERT(currentThread() == m_transaction->database().originThreadID());
</span><span class="cx">
</span><span class="lines">@@ -270,9 +273,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<SerializedScriptValue> serializedValue = SerializedScriptValue::create(&state, value, nullptr, nullptr);
</span><del>- if (state.hadException()) {
</del><ins>+ if (UNLIKELY(scope.exception())) {
</ins><span class="cx"> // Clear the DOM exception from the serializer so we can give a more targeted exception.
</span><del>- state.clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx">
</span><span class="cx"> ec.code = IDBDatabaseException::DataCloneError;
</span><span class="cx"> ec.message = ASCIILiteral("Failed to store record in an IDBObjectStore: An object could not be cloned.");
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -859,7 +859,9 @@
</span><span class="cx"> // using steps to assign a key to a value using a key path.
</span><span class="cx"> ThreadSafeDataBuffer injectedRecordValue;
</span><span class="cx"> if (usedKeyIsGenerated && !objectStoreInfo->keyPath().isNull()) {
</span><del>- JSLockHolder locker(databaseThreadVM());
</del><ins>+ VM& vm = databaseThreadVM();
+ JSLockHolder locker(vm);
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx">
</span><span class="cx"> auto value = deserializeIDBValueToJSValue(databaseThreadExecState(), originalRecordValue.data());
</span><span class="cx"> if (value.isUndefined()) {
</span><span class="lines">@@ -873,7 +875,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> auto serializedValue = SerializedScriptValue::create(&databaseThreadExecState(), value, nullptr, nullptr);
</span><del>- if (databaseThreadExecState().hadException()) {
</del><ins>+ if (UNLIKELY(scope.exception())) {
</ins><span class="cx"> postDatabaseTaskReply(createCrossThreadTask(*this, &UniqueIDBDatabase::didPerformPutOrAdd, callbackIdentifier, IDBError(IDBDatabaseException::ConstraintError, ASCIILiteral("Unable to serialize record value after injecting record key")), usedKey));
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamSDPProcessorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/SDPProcessor.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/SDPProcessor.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/Modules/mediastream/SDPProcessor.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2015, 2016 Ericsson AB. All rights reserved.
</span><ins>+ * Copyright (C) 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -500,15 +501,17 @@
</span><span class="cx">
</span><span class="cx"> ScriptController& scriptController = document->frame()->script();
</span><span class="cx"> JSDOMGlobalObject* globalObject = JSC::jsCast<JSDOMGlobalObject*>(scriptController.globalObject(*m_isolatedWorld));
</span><ins>+ JSC::VM& vm = globalObject->vm();
+ JSC::JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
</ins><span class="cx"> JSC::ExecState* exec = globalObject->globalExec();
</span><del>- JSC::JSLockHolder lock(exec);
</del><span class="cx">
</span><span class="cx"> JSC::JSValue probeFunctionValue = globalObject->get(exec, JSC::Identifier::fromString(exec, "generate"));
</span><span class="cx"> if (!probeFunctionValue.isFunction()) {
</span><span class="cx"> URL scriptURL;
</span><span class="cx"> scriptController.evaluateInWorld(ScriptSourceCode(SDPProcessorScriptResource::scriptString(), scriptURL), *m_isolatedWorld);
</span><del>- if (exec->hadException()) {
- exec->clearException();
</del><ins>+ if (UNLIKELY(scope.exception())) {
+ scope.clearException();
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -527,9 +530,9 @@
</span><span class="cx"> argList.append(JSC::jsString(exec, argument));
</span><span class="cx">
</span><span class="cx"> JSC::JSValue result = JSC::call(exec, function, callType, callData, globalObject, argList);
</span><del>- if (exec->hadException()) {
</del><ins>+ if (UNLIKELY(scope.exception())) {
</ins><span class="cx"> LOG_ERROR("SDPProcessor script threw in function %s", functionName.ascii().data());
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulespluginsQuickTimePluginReplacementmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.mm (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.mm 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.mm 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -160,8 +160,10 @@
</span><span class="cx"> DOMWrapperWorld& world = isolatedWorld();
</span><span class="cx"> ScriptController& scriptController = m_parentElement->document().frame()->script();
</span><span class="cx"> JSDOMGlobalObject* globalObject = JSC::jsCast<JSDOMGlobalObject*>(scriptController.globalObject(world));
</span><ins>+ JSC::VM& vm = globalObject->vm();
+ JSC::JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
</ins><span class="cx"> JSC::ExecState* exec = globalObject->globalExec();
</span><del>- JSC::JSLockHolder lock(exec);
</del><span class="cx">
</span><span class="cx"> JSC::JSValue replacementFunction = globalObject->get(exec, JSC::Identifier::fromString(exec, "createPluginReplacement"));
</span><span class="cx"> if (replacementFunction.isFunction())
</span><span class="lines">@@ -168,9 +170,9 @@
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> scriptController.evaluateInWorld(ScriptSourceCode(quickTimePluginReplacementScript()), world);
</span><del>- if (exec->hadException()) {
</del><ins>+ if (UNLIKELY(scope.exception())) {
</ins><span class="cx"> LOG(Plugins, "%p - Exception when evaluating QuickTime plugin replacement script", this);
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -188,15 +190,17 @@
</span><span class="cx"> DOMWrapperWorld& world = isolatedWorld();
</span><span class="cx"> ScriptController& scriptController = m_parentElement->document().frame()->script();
</span><span class="cx"> JSDOMGlobalObject* globalObject = JSC::jsCast<JSDOMGlobalObject*>(scriptController.globalObject(world));
</span><ins>+ JSC::VM& vm = globalObject->vm();
+ JSC::JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
</ins><span class="cx"> JSC::ExecState* exec = globalObject->globalExec();
</span><del>- JSC::JSLockHolder lock(exec);
-
</del><ins>+
</ins><span class="cx"> // Lookup the "createPluginReplacement" function.
</span><span class="cx"> JSC::JSValue replacementFunction = globalObject->get(exec, JSC::Identifier::fromString(exec, "createPluginReplacement"));
</span><span class="cx"> if (replacementFunction.isUndefinedOrNull())
</span><span class="cx"> return false;
</span><span class="cx"> JSC::JSObject* replacementObject = replacementFunction.toObject(exec);
</span><del>- ASSERT(!exec->hadException());
</del><ins>+ ASSERT(!scope.exception());
</ins><span class="cx"> JSC::CallData callData;
</span><span class="cx"> JSC::CallType callType = replacementObject->methodTable()->getCallData(replacementObject, callData);
</span><span class="cx"> if (callType == JSC::CallType::None)
</span><span class="lines">@@ -209,32 +213,32 @@
</span><span class="cx"> argList.append(toJS<String>(exec, globalObject, m_names));
</span><span class="cx"> argList.append(toJS<String>(exec, globalObject, m_values));
</span><span class="cx"> JSC::JSValue replacement = call(exec, replacementObject, callType, callData, globalObject, argList);
</span><del>- if (exec->hadException()) {
- exec->clearException();
</del><ins>+ if (UNLIKELY(scope.exception())) {
+ scope.clearException();
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Get the <video> created to replace the plug-in.
</span><span class="cx"> JSC::JSValue value = replacement.get(exec, JSC::Identifier::fromString(exec, "video"));
</span><del>- if (!exec->hadException() && !value.isUndefinedOrNull())
</del><ins>+ if (!scope.exception() && !value.isUndefinedOrNull())
</ins><span class="cx"> m_mediaElement = JSHTMLVideoElement::toWrapped(value);
</span><span class="cx">
</span><span class="cx"> if (!m_mediaElement) {
</span><span class="cx"> LOG(Plugins, "%p - Failed to find <video> element created by QuickTime plugin replacement script.", this);
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Get the scripting interface.
</span><span class="cx"> value = replacement.get(exec, JSC::Identifier::fromString(exec, "scriptObject"));
</span><del>- if (!exec->hadException() && !value.isUndefinedOrNull()) {
</del><ins>+ if (!scope.exception() && !value.isUndefinedOrNull()) {
</ins><span class="cx"> m_scriptObject = value.toObject(exec);
</span><del>- ASSERT(!exec->hadException());
</del><ins>+ ASSERT(!scope.exception());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!m_scriptObject) {
</span><span class="cx"> LOG(Plugins, "%p - Failed to find script object created by QuickTime plugin replacement.", this);
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsArrayValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ArrayValue.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ArrayValue.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/ArrayValue.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -82,6 +82,9 @@
</span><span class="cx">
</span><span class="cx"> bool ArrayValue::get(size_t index, String& value) const
</span><span class="cx"> {
</span><ins>+ VM& vm = m_exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> if (isUndefinedOrNull())
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -90,7 +93,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> value = indexedValue.toWTFString(m_exec);
</span><del>- if (m_exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsDictionarycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/Dictionary.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/Dictionary.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/Dictionary.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -61,6 +61,8 @@
</span><span class="cx">
</span><span class="cx"> JSObject* object = m_dictionary.initializerObject();
</span><span class="cx"> ExecState* exec = m_dictionary.execState();
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx">
</span><span class="cx"> PropertyNameArray propertyNames(exec, PropertyNameMode::Strings);
</span><span class="cx"> JSObject::getOwnPropertyNames(object, exec, propertyNames, EnumerationMode());
</span><span class="lines">@@ -69,10 +71,10 @@
</span><span class="cx"> if (stringKey.isEmpty())
</span><span class="cx"> continue;
</span><span class="cx"> JSValue value = object->get(exec, *it);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> continue;
</span><span class="cx"> String stringValue = value.toString(exec)->value(exec);
</span><del>- if (!exec->hadException())
</del><ins>+ if (LIKELY(!scope.exception()))
</ins><span class="cx"> map.set(stringKey, stringValue);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsIDBBindingUtilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/IDBBindingUtilities.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/IDBBindingUtilities.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/IDBBindingUtilities.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -90,6 +90,7 @@
</span><span class="cx">
</span><span class="cx"> VM& vm = state.vm();
</span><span class="cx"> Locker<JSLock> locker(vm.apiLock());
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx">
</span><span class="cx"> switch (key->type()) {
</span><span class="cx"> case KeyType::Array: {
</span><span class="lines">@@ -96,7 +97,7 @@
</span><span class="cx"> auto& inArray = key->array();
</span><span class="cx"> unsigned size = inArray.size();
</span><span class="cx"> auto outArray = constructEmptyArray(&state, 0, &globalObject, size);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> for (size_t i = 0; i < size; ++i)
</span><span class="cx"> outArray->putDirectIndex(&state, i, toJS(state, globalObject, inArray.at(i).get()));
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSApplePaySessionCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSApplePaySessionCustom.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSApplePaySessionCustom.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSApplePaySessionCustom.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -55,15 +55,15 @@
</span><span class="cx">
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> uint16_t status = convert<uint16_t>(state, state.argument(0), NormalConversion);
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> Dictionary newTotal = { &state, state.argument(1) };
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> ArrayValue newLineItems { &state, state.argument(2) };
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> impl.completeShippingMethodSelection(status, newTotal, newLineItems, ec);
</span><span class="cx"> setDOMException(&state, ec);
</span><span class="lines">@@ -88,19 +88,19 @@
</span><span class="cx">
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> uint16_t status = convert<uint16_t>(state, state.argument(0), NormalConversion);
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> ArrayValue newShippingMethods { &state, state.argument(1) };
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> Dictionary newTotal = { &state, state.argument(2) };
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> ArrayValue newLineItems { &state, state.argument(3) };
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> impl.completeShippingContactSelection(status, newShippingMethods, newTotal, newLineItems, ec);
</span><span class="cx"> setDOMException(&state, ec);
</span><span class="lines">@@ -125,11 +125,11 @@
</span><span class="cx">
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> Dictionary newTotal = { &state, state.argument(0) };
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> ArrayValue newLineItems { &state, state.argument(1) };
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> impl.completePaymentMethodSelection(newTotal, newLineItems, ec);
</span><span class="cx"> setDOMException(&state, ec);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSAudioTrackCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSAudioTrackCustom.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSAudioTrackCustom.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSAudioTrackCustom.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -43,8 +43,11 @@
</span><span class="cx"> void JSAudioTrack::setKind(ExecState& state, JSValue value)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><ins>+ VM& vm = state.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> auto& string = value.toString(&state)->value(&state);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> wrapped().setKind(string);
</span><span class="cx"> #else
</span><span class="lines">@@ -56,8 +59,11 @@
</span><span class="cx"> void JSAudioTrack::setLanguage(ExecState& state, JSValue value)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><ins>+ VM& vm = state.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> auto& string = value.toString(&state)->value(&state);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> wrapped().setLanguage(string);
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSBlobCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSBlobCustom.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSBlobCustom.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSBlobCustom.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx">
</span><span class="cx"> unsigned blobPartsLength = 0;
</span><span class="cx"> JSObject* blobParts = toJSSequence(exec, exec.uncheckedArgument(0), blobPartsLength);
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> ASSERT(blobParts);
</span><span class="cx">
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx">
</span><span class="cx"> // Attempt to get the endings property and validate it.
</span><span class="cx"> bool containsEndings = dictionary.get("endings", endings);
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> if (containsEndings) {
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx">
</span><span class="cx"> // Attempt to get the type property.
</span><span class="cx"> dictionary.get("type", type);
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < blobPartsLength; ++i) {
</span><span class="cx"> JSValue item = blobParts->get(&exec, i);
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> if (ArrayBuffer* arrayBuffer = toArrayBuffer(item))
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> blobBuilder.append(blob);
</span><span class="cx"> else {
</span><span class="cx"> String string = item.toWTFString(&exec);
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> blobBuilder.append(string, endings);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCSSStyleDeclarationCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -355,7 +355,7 @@
</span><span class="cx"> return throwException(&state, scope, createNotEnoughArgumentsError(&state));
</span><span class="cx">
</span><span class="cx"> String propertyName = state.uncheckedArgument(0).toWTFString(&state);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> RefPtr<CSSValue> cssValue = wrapped().getPropertyCSSValue(propertyName);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCommandLineAPIHostCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCommandLineAPIHostCustom.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCommandLineAPIHostCustom.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSCommandLineAPIHostCustom.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -68,8 +68,9 @@
</span><span class="cx"> static JSArray* getJSListenerFunctions(ExecState& state, Document* document, const EventListenerInfo& listenerInfo)
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state.vm();
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSArray* result = constructEmptyArray(&state, nullptr);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> size_t handlersCount = listenerInfo.eventListenerVector.size();
</span><span class="cx"> for (size_t i = 0, outputIndex = 0; i < handlersCount; ++i) {
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCryptoAlgorithmDictionarycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCryptoAlgorithmDictionary.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCryptoAlgorithmDictionary.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSCryptoAlgorithmDictionary.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (!algorithmName.containsOnlyASCII()) {
</span><span class="lines">@@ -106,12 +106,14 @@
</span><span class="cx"> // FXIME: Teach JSDictionary how to return JSValues, and use that to get hash element value.
</span><span class="cx">
</span><span class="cx"> ExecState* exec = dictionary.execState();
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSObject* object = dictionary.initializerObject();
</span><span class="cx">
</span><span class="cx"> Identifier identifier = Identifier::fromString(exec, "hash");
</span><span class="cx">
</span><span class="cx"> JSValue hash = getProperty(exec, object, "hash");
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (hash.isUndefinedOrNull()) {
</span><span class="lines">@@ -134,16 +136,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue iv = getProperty(exec, value.getObject(), "iv");
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> auto result = adoptRef(*new CryptoAlgorithmAesCbcParams);
</span><span class="cx">
</span><span class="cx"> CryptoOperationData ivData;
</span><del>- if (!cryptoOperationDataFromJSValue(exec, iv, ivData)) {
- ASSERT(exec->hadException());
</del><ins>+ auto success = cryptoOperationDataFromJSValue(exec, iv, ivData);
+ ASSERT(scope.exception() || success);
+ if (!success)
</ins><span class="cx"> return nullptr;
</span><del>- }
</del><span class="cx">
</span><span class="cx"> if (ivData.second != 16) {
</span><span class="cx"> throwException(exec, scope, createError(exec, "AES-CBC initialization data must be 16 bytes"));
</span><span class="lines">@@ -168,7 +170,7 @@
</span><span class="cx"> auto result = adoptRef(*new CryptoAlgorithmAesKeyGenParams);
</span><span class="cx">
</span><span class="cx"> JSValue lengthValue = getProperty(&state, value.getObject(), "length");
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> result->length = convert<uint16_t>(state, lengthValue, EnforceRange);
</span><span class="lines">@@ -189,10 +191,10 @@
</span><span class="cx"> JSDictionary jsDictionary(&state, value.getObject());
</span><span class="cx"> auto result = adoptRef(*new CryptoAlgorithmHmacParams);
</span><span class="cx">
</span><del>- if (!getHashAlgorithm(jsDictionary, result->hash, HashRequirement::Required)) {
- ASSERT(state.hadException());
</del><ins>+ auto success = getHashAlgorithm(jsDictionary, result->hash, HashRequirement::Required);
+ ASSERT_UNUSED(scope, scope.exception() || success);
+ if (!success)
</ins><span class="cx"> return nullptr;
</span><del>- }
</del><span class="cx">
</span><span class="cx"> return WTFMove(result);
</span><span class="cx"> }
</span><span class="lines">@@ -210,13 +212,13 @@
</span><span class="cx"> JSDictionary jsDictionary(&state, value.getObject());
</span><span class="cx"> auto result = adoptRef(*new CryptoAlgorithmHmacKeyParams);
</span><span class="cx">
</span><del>- if (!getHashAlgorithm(jsDictionary, result->hash, HashRequirement::Required)) {
- ASSERT(state.hadException());
</del><ins>+ auto success = getHashAlgorithm(jsDictionary, result->hash, HashRequirement::Required);
+ ASSERT(scope.exception() || success);
+ if (!success)
</ins><span class="cx"> return nullptr;
</span><del>- }
</del><span class="cx">
</span><span class="cx"> result->hasLength = jsDictionary.get("length", result->length);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> return WTFMove(result);
</span><span class="lines">@@ -236,16 +238,16 @@
</span><span class="cx"> auto result = adoptRef(*new CryptoAlgorithmRsaKeyGenParams);
</span><span class="cx">
</span><span class="cx"> JSValue modulusLengthValue = getProperty(&state, value.getObject(), "modulusLength");
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> // FIXME: Why no EnforceRange? Filed as <https://www.w3.org/Bugs/Public/show_bug.cgi?id=23779>.
</span><span class="cx"> result->modulusLength = convert<uint32_t>(state, modulusLengthValue, NormalConversion);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> JSValue publicExponentValue = getProperty(&state, value.getObject(), "publicExponent");
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> RefPtr<Uint8Array> publicExponentArray = toUint8Array(publicExponentValue);
</span><span class="lines">@@ -279,13 +281,13 @@
</span><span class="cx"> JSDictionary jsDictionary(exec, value.getObject());
</span><span class="cx"> auto result = adoptRef(*new CryptoAlgorithmRsaOaepParams);
</span><span class="cx">
</span><del>- if (!getHashAlgorithm(jsDictionary, result->hash, HashRequirement::Required)) {
- ASSERT(exec->hadException());
</del><ins>+ auto success = getHashAlgorithm(jsDictionary, result->hash, HashRequirement::Required);
+ ASSERT(scope.exception() || success);
+ if (!success)
</ins><span class="cx"> return nullptr;
</span><del>- }
</del><span class="cx">
</span><span class="cx"> JSValue labelValue = getProperty(exec, value.getObject(), "label");
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> result->hasLabel = !labelValue.isUndefinedOrNull();
</span><span class="lines">@@ -293,10 +295,10 @@
</span><span class="cx"> return WTFMove(result);
</span><span class="cx">
</span><span class="cx"> CryptoOperationData labelData;
</span><del>- if (!cryptoOperationDataFromJSValue(exec, labelValue, labelData)) {
- ASSERT(exec->hadException());
</del><ins>+ success = cryptoOperationDataFromJSValue(exec, labelValue, labelData);
+ ASSERT(scope.exception() || success);
+ if (!success)
</ins><span class="cx"> return nullptr;
</span><del>- }
</del><span class="cx">
</span><span class="cx"> result->label.append(labelData.first, labelData.second);
</span><span class="cx">
</span><span class="lines">@@ -316,10 +318,10 @@
</span><span class="cx"> JSDictionary jsDictionary(&state, value.getObject());
</span><span class="cx"> auto result = adoptRef(*new CryptoAlgorithmRsaSsaParams);
</span><span class="cx">
</span><del>- if (!getHashAlgorithm(jsDictionary, result->hash, HashRequirement::Required)) {
- ASSERT(state.hadException());
</del><ins>+ auto success = getHashAlgorithm(jsDictionary, result->hash, HashRequirement::Required);
+ ASSERT(scope.exception() || success);
+ if (!success)
</ins><span class="cx"> return nullptr;
</span><del>- }
</del><span class="cx">
</span><span class="cx"> return WTFMove(result);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCryptoKeySerializationJWKcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCryptoKeySerializationJWK.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCryptoKeySerializationJWK.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSCryptoKeySerializationJWK.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> JSValue value = slot.getValue(exec, identifier);
</span><del>- ASSERT(!exec->hadException());
</del><ins>+ ASSERT(!scope.exception());
</ins><span class="cx"> if (!isJSArray(value)) {
</span><span class="cx"> throwTypeError(exec, scope, String::format("Expected an array for \"%s\" JSON key", key));
</span><span class="cx"> return false;
</span><span class="lines">@@ -85,10 +85,10 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> JSValue jsValue = slot.getValue(exec, identifier);
</span><del>- ASSERT(!exec->hadException());
</del><ins>+ ASSERT(!scope.exception());
</ins><span class="cx"> if (!jsValue.getString(exec, result)) {
</span><span class="cx"> // Can get an out of memory exception.
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> throwTypeError(exec, scope, String::format("Expected a string value for \"%s\" JSON key", key));
</span><span class="cx"> return false;
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> JSValue jsValue = slot.getValue(exec, identifier);
</span><del>- ASSERT(!exec->hadException());
</del><ins>+ ASSERT(!scope.exception());
</ins><span class="cx"> if (!jsValue.isBoolean()) {
</span><span class="cx"> throwTypeError(exec, scope, String::format("Expected a boolean value for \"%s\" JSON key", key));
</span><span class="cx"> return false;
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> JSValue jsonValue = JSONParse(exec, jsonString);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!jsonValue || !jsonValue.isObject()) {
</span><span class="lines">@@ -298,7 +298,7 @@
</span><span class="cx"> JSValue jsValue = keyOps->getIndex(m_exec, i);
</span><span class="cx"> String operation;
</span><span class="cx"> if (!jsValue.getString(m_exec, operation)) {
</span><del>- if (!m_exec->hadException())
</del><ins>+ if (!scope.exception())
</ins><span class="cx"> throwTypeError(m_exec, scope, ASCIILiteral("JWK key_ops attribute could not be processed"));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -320,7 +320,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- if (m_exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> String jwkUseString;
</span><span class="lines">@@ -391,7 +391,7 @@
</span><span class="cx">
</span><span class="cx"> String keyBase64URL;
</span><span class="cx"> if (!getStringFromJSON(m_exec, m_json.get(), "k", keyBase64URL)) {
</span><del>- if (!m_exec->hadException())
</del><ins>+ if (!scope.exception())
</ins><span class="cx"> throwTypeError(m_exec, scope, ASCIILiteral("Secret key data is not present is JWK"));
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -420,7 +420,7 @@
</span><span class="cx"> Vector<uint8_t> privateExponent;
</span><span class="cx">
</span><span class="cx"> if (!getBigIntegerVectorFromJSON(m_exec, m_json.get(), "n", modulus)) {
</span><del>- if (!m_exec->hadException())
</del><ins>+ if (!scope.exception())
</ins><span class="cx"> throwTypeError(m_exec, scope, ASCIILiteral("Required JWK \"n\" member is missing"));
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -431,13 +431,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!getBigIntegerVectorFromJSON(m_exec, m_json.get(), "e", exponent)) {
</span><del>- if (!m_exec->hadException())
</del><ins>+ if (!scope.exception())
</ins><span class="cx"> throwTypeError(m_exec, scope, ASCIILiteral("Required JWK \"e\" member is missing"));
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!getBigIntegerVectorFromJSON(m_exec, m_json.get(), "d", modulus)) {
</span><del>- if (m_exec->hadException())
</del><ins>+ if (scope.exception())
</ins><span class="cx"> return nullptr;
</span><span class="cx"> return CryptoKeyDataRSAComponents::createPublic(modulus, exponent);
</span><span class="cx"> }
</span><span class="lines">@@ -446,31 +446,31 @@
</span><span class="cx"> CryptoKeyDataRSAComponents::PrimeInfo secondPrimeInfo;
</span><span class="cx"> Vector<CryptoKeyDataRSAComponents::PrimeInfo> otherPrimeInfos;
</span><span class="cx"> if (!getBigIntegerVectorFromJSON(m_exec, m_json.get(), "p", firstPrimeInfo.primeFactor)) {
</span><del>- if (m_exec->hadException())
</del><ins>+ if (scope.exception())
</ins><span class="cx"> return nullptr;
</span><span class="cx"> return CryptoKeyDataRSAComponents::createPrivate(modulus, exponent, privateExponent);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!getBigIntegerVectorFromJSON(m_exec, m_json.get(), "dp", firstPrimeInfo.factorCRTExponent)) {
</span><del>- if (m_exec->hadException())
</del><ins>+ if (scope.exception())
</ins><span class="cx"> return nullptr;
</span><span class="cx"> return CryptoKeyDataRSAComponents::createPrivate(modulus, exponent, privateExponent);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!getBigIntegerVectorFromJSON(m_exec, m_json.get(), "q", secondPrimeInfo.primeFactor)) {
</span><del>- if (m_exec->hadException())
</del><ins>+ if (scope.exception())
</ins><span class="cx"> return nullptr;
</span><span class="cx"> return CryptoKeyDataRSAComponents::createPrivate(modulus, exponent, privateExponent);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!getBigIntegerVectorFromJSON(m_exec, m_json.get(), "dq", secondPrimeInfo.factorCRTExponent)) {
</span><del>- if (m_exec->hadException())
</del><ins>+ if (scope.exception())
</ins><span class="cx"> return nullptr;
</span><span class="cx"> return CryptoKeyDataRSAComponents::createPrivate(modulus, exponent, privateExponent);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!getBigIntegerVectorFromJSON(m_exec, m_json.get(), "qi", secondPrimeInfo.factorCRTCoefficient)) {
</span><del>- if (m_exec->hadException())
</del><ins>+ if (scope.exception())
</ins><span class="cx"> return nullptr;
</span><span class="cx"> return CryptoKeyDataRSAComponents::createPrivate(modulus, exponent, privateExponent);
</span><span class="cx"> }
</span><span class="lines">@@ -477,7 +477,7 @@
</span><span class="cx">
</span><span class="cx"> JSArray* otherPrimeInfoJSArray;
</span><span class="cx"> if (!getJSArrayFromJSON(m_exec, m_json.get(), "oth", otherPrimeInfoJSArray)) {
</span><del>- if (m_exec->hadException())
</del><ins>+ if (scope.exception())
</ins><span class="cx"> return nullptr;
</span><span class="cx"> return CryptoKeyDataRSAComponents::createPrivateWithAdditionalData(modulus, exponent, privateExponent, firstPrimeInfo, secondPrimeInfo, otherPrimeInfos);
</span><span class="cx"> }
</span><span class="lines">@@ -485,7 +485,7 @@
</span><span class="cx"> for (size_t i = 0; i < otherPrimeInfoJSArray->length(); ++i) {
</span><span class="cx"> CryptoKeyDataRSAComponents::PrimeInfo info;
</span><span class="cx"> JSValue element = otherPrimeInfoJSArray->getIndex(m_exec, i);
</span><del>- if (m_exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> if (!element.isObject()) {
</span><span class="cx"> throwTypeError(m_exec, scope, ASCIILiteral("JWK \"oth\" array member is not an object"));
</span><span class="lines">@@ -492,17 +492,17 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx"> if (!getBigIntegerVectorFromJSON(m_exec, asObject(element), "r", info.primeFactor)) {
</span><del>- if (!m_exec->hadException())
</del><ins>+ if (!scope.exception())
</ins><span class="cx"> throwTypeError(m_exec, scope, ASCIILiteral("Cannot get prime factor for a prime in \"oth\" dictionary"));
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx"> if (!getBigIntegerVectorFromJSON(m_exec, asObject(element), "d", info.factorCRTExponent)) {
</span><del>- if (!m_exec->hadException())
</del><ins>+ if (!scope.exception())
</ins><span class="cx"> throwTypeError(m_exec, scope, ASCIILiteral("Cannot get factor CRT exponent for a prime in \"oth\" dictionary"));
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx"> if (!getBigIntegerVectorFromJSON(m_exec, asObject(element), "t", info.factorCRTCoefficient)) {
</span><del>- if (!m_exec->hadException())
</del><ins>+ if (!scope.exception())
</ins><span class="cx"> throwTypeError(m_exec, scope, ASCIILiteral("Cannot get factor CRT coefficient for a prime in \"oth\" dictionary"));
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -519,7 +519,7 @@
</span><span class="cx">
</span><span class="cx"> String jwkKeyType;
</span><span class="cx"> if (!getStringFromJSON(m_exec, m_json.get(), "kty", jwkKeyType)) {
</span><del>- if (!m_exec->hadException())
</del><ins>+ if (!scope.exception())
</ins><span class="cx"> throwTypeError(m_exec, scope, ASCIILiteral("Required JWK \"kty\" member is missing"));
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -549,6 +549,9 @@
</span><span class="cx">
</span><span class="cx"> static void buildJSONForRSAComponents(JSC::ExecState* exec, const CryptoKeyDataRSAComponents& data, JSC::JSObject* result)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> addToJSON(exec, result, "kty", "RSA");
</span><span class="cx"> addToJSON(exec, result, "n", base64URLEncode(data.modulus()));
</span><span class="cx"> addToJSON(exec, result, "e", base64URLEncode(data.exponent()));
</span><span class="lines">@@ -570,9 +573,8 @@
</span><span class="cx"> if (data.otherPrimeInfos().isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- VM& vm = exec->vm();
</del><span class="cx"> JSArray* oth = constructEmptyArray(exec, 0, exec->lexicalGlobalObject(), data.otherPrimeInfos().size());
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> for (size_t i = 0, size = data.otherPrimeInfos().size(); i < size; ++i) {
</span><span class="cx"> JSObject* jsPrimeInfo = constructEmptyObject(exec);
</span><span class="lines">@@ -698,8 +700,9 @@
</span><span class="cx"> static void addUsagesToJSON(ExecState* exec, JSObject* json, CryptoKeyUsage usages)
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><ins>+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSArray* keyOps = constructEmptyArray(exec, 0, exec->lexicalGlobalObject(), 0);
</span><del>- if (UNLIKELY(vm.exception()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> unsigned index = 0;
</span><span class="lines">@@ -738,13 +741,13 @@
</span><span class="cx"> JSObject* result = constructEmptyObject(exec);
</span><span class="cx">
</span><span class="cx"> addJWKAlgorithmToJSON(exec, result, key);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return String();
</span><span class="cx">
</span><span class="cx"> addBoolToJSON(exec, result, "ext", key.extractable());
</span><span class="cx">
</span><span class="cx"> addUsagesToJSON(exec, result, key.usagesBitmap());
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return String();
</span><span class="cx">
</span><span class="cx"> if (is<CryptoKeyDataOctetSequence>(*keyData))
</span><span class="lines">@@ -755,7 +758,7 @@
</span><span class="cx"> throwTypeError(exec, scope, ASCIILiteral("Key doesn't support exportKey"));
</span><span class="cx"> return String();
</span><span class="cx"> }
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return String();
</span><span class="cx">
</span><span class="cx"> return JSONStringify(exec, result, 0);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCustomElementInterfacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCustomElementInterface.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCustomElementInterface.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSCustomElementInterface.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -68,6 +68,7 @@
</span><span class="cx">
</span><span class="cx"> VM& vm = m_isolatedWorld->vm();
</span><span class="cx"> JSLockHolder lock(vm);
</span><ins>+ auto scope = DECLARE_CATCH_SCOPE(vm);
</ins><span class="cx">
</span><span class="cx"> if (!m_constructor)
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -79,11 +80,11 @@
</span><span class="cx">
</span><span class="cx"> auto& state = *context->execState();
</span><span class="cx"> RefPtr<Element> element = constructCustomElementSynchronously(downcast<Document>(*context), vm, state, m_constructor.get(), localName);
</span><ins>+ ASSERT(!!scope.exception() == !element);
</ins><span class="cx"> if (!element) {
</span><del>- auto* exception = vm.exception();
- ASSERT(exception);
</del><span class="cx"> if (shouldClearException == ShouldClearException::Clear) {
</span><del>- state.clearException();
</del><ins>+ auto* exception = scope.exception();
+ scope.clearException();
</ins><span class="cx"> reportException(&state, exception);
</span><span class="cx"> }
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -110,7 +111,7 @@
</span><span class="cx"> InspectorInstrumentationCookie cookie = JSMainThreadExecState::instrumentFunctionConstruct(&document, constructType, constructData);
</span><span class="cx"> JSValue newElement = construct(&state, constructor, constructType, constructData, args);
</span><span class="cx"> InspectorInstrumentation::didCallFunction(cookie, &document);
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> ASSERT(!newElement.isEmpty());
</span><span class="lines">@@ -166,7 +167,7 @@
</span><span class="cx"> ASSERT(context->isDocument());
</span><span class="cx"> JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(context, *m_isolatedWorld);
</span><span class="cx"> ExecState* state = globalObject->globalExec();
</span><del>- if (state->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> ConstructData constructData;
</span><span class="lines">@@ -185,7 +186,7 @@
</span><span class="cx">
</span><span class="cx"> m_constructionStack.removeLast();
</span><span class="cx">
</span><del>- if (state->hadException()) {
</del><ins>+ if (UNLIKELY(scope.exception())) {
</ins><span class="cx"> element.setIsFailedCustomElement(*this);
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCustomElementRegistryCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCustomElementRegistryCustom.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCustomElementRegistryCustom.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSCustomElementRegistryCustom.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> JSValue callback = prototype.get(&state, id);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> if (callback.isUndefined())
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> return throwException(&state, scope, createNotEnoughArgumentsError(&state));
</span><span class="cx">
</span><span class="cx"> AtomicString localName(state.uncheckedArgument(0).toString(&state)->toAtomicString(&state));
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> JSValue constructorValue = state.uncheckedArgument(1);
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue prototypeValue = constructor->get(&state, vm.propertyNames->prototype);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> if (!prototypeValue.isObject())
</span><span class="cx"> return throwTypeError(&state, scope, ASCIILiteral("Custom element constructor's prototype must be an object"));
</span><span class="lines">@@ -129,25 +129,25 @@
</span><span class="cx">
</span><span class="cx"> if (auto* connectedCallback = getCustomElementCallback(state, prototypeObject, Identifier::fromString(&vm, "connectedCallback")))
</span><span class="cx"> elementInterface->setConnectedCallback(connectedCallback);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> if (auto* disconnectedCallback = getCustomElementCallback(state, prototypeObject, Identifier::fromString(&vm, "disconnectedCallback")))
</span><span class="cx"> elementInterface->setDisconnectedCallback(disconnectedCallback);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> if (auto* adoptedCallback = getCustomElementCallback(state, prototypeObject, Identifier::fromString(&vm, "adoptedCallback")))
</span><span class="cx"> elementInterface->setAdoptedCallback(adoptedCallback);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> auto* attributeChangedCallback = getCustomElementCallback(state, prototypeObject, Identifier::fromString(&vm, "attributeChangedCallback"));
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> if (attributeChangedCallback) {
</span><span class="cx"> auto value = convertOptional<Vector<String>>(state, constructor->get(&state, Identifier::fromString(&state, "observedAttributes")));
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> if (value)
</span><span class="cx"> elementInterface->setAttributeChangedCallback(attributeChangedCallback, *value);
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx"> return throwException(&state, scope, createNotEnoughArgumentsError(&state));
</span><span class="cx">
</span><span class="cx"> AtomicString localName(state.uncheckedArgument(0).toString(&state)->toAtomicString(&state));
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> if (!validateCustomElementNameAndThrowIfNeeded(state, localName))
</span><span class="lines">@@ -191,13 +191,15 @@
</span><span class="cx">
</span><span class="cx"> JSValue JSCustomElementRegistry::whenDefined(ExecState& state)
</span><span class="cx"> {
</span><ins>+ auto scope = DECLARE_CATCH_SCOPE(state.vm());
+
</ins><span class="cx"> JSDOMGlobalObject& globalObject = *jsCast<JSDOMGlobalObject*>(state.lexicalGlobalObject());
</span><span class="cx"> auto& promiseDeferred = *JSPromiseDeferred::create(&state, &globalObject);
</span><span class="cx"> JSValue promise = whenDefinedPromise(state, globalObject, wrapped());
</span><span class="cx">
</span><del>- if (state.hadException()) {
</del><ins>+ if (UNLIKELY(scope.exception())) {
</ins><span class="cx"> rejectPromiseWithExceptionIfAny(state, globalObject, promiseDeferred);
</span><del>- ASSERT(!state.hadException());
</del><ins>+ ASSERT(!scope.exception());
</ins><span class="cx"> return promiseDeferred.promise();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMBindingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -119,8 +119,11 @@
</span><span class="cx">
</span><span class="cx"> String valueToUSVString(ExecState* exec, JSValue value)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> String string = value.toWTFString(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return { };
</span><span class="cx"> StringView view { string };
</span><span class="cx">
</span><span class="lines">@@ -187,10 +190,11 @@
</span><span class="cx">
</span><span class="cx"> void reportException(ExecState* exec, JSValue exceptionValue, CachedScript* cachedScript)
</span><span class="cx"> {
</span><del>- RELEASE_ASSERT(exec->vm().currentThreadIsHoldingAPILock());
</del><ins>+ VM& vm = exec->vm();
+ RELEASE_ASSERT(vm.currentThreadIsHoldingAPILock());
</ins><span class="cx"> Exception* exception = jsDynamicCast<Exception*>(exceptionValue);
</span><span class="cx"> if (!exception) {
</span><del>- exception = exec->lastException();
</del><ins>+ exception = vm.lastException();
</ins><span class="cx"> if (!exception)
</span><span class="cx"> exception = Exception::create(exec->vm(), exceptionValue, Exception::DoNotCaptureStack);
</span><span class="cx"> }
</span><span class="lines">@@ -200,7 +204,10 @@
</span><span class="cx">
</span><span class="cx"> void reportException(ExecState* exec, Exception* exception, CachedScript* cachedScript, ExceptionDetails* exceptionDetails)
</span><span class="cx"> {
</span><del>- RELEASE_ASSERT(exec->vm().currentThreadIsHoldingAPILock());
</del><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
+ RELEASE_ASSERT(vm.currentThreadIsHoldingAPILock());
</ins><span class="cx"> if (isTerminatedExecutionException(exception))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -207,8 +214,8 @@
</span><span class="cx"> ErrorHandlingScope errorScope(exec->vm());
</span><span class="cx">
</span><span class="cx"> RefPtr<ScriptCallStack> callStack(createScriptCallStackFromException(exec, exception, ScriptCallStack::maxCallStackSizeToCapture));
</span><del>- exec->clearException();
- exec->clearLastException();
</del><ins>+ scope.clearException();
+ vm.clearLastException();
</ins><span class="cx">
</span><span class="cx"> JSDOMGlobalObject* globalObject = jsCast<JSDOMGlobalObject*>(exec->lexicalGlobalObject());
</span><span class="cx"> if (JSDOMWindow* window = jsDynamicCast<JSDOMWindow*>(globalObject)) {
</span><span class="lines">@@ -239,8 +246,8 @@
</span><span class="cx">
</span><span class="cx"> // We need to clear any new exception that may be thrown in the toString() call above.
</span><span class="cx"> // reportException() is not supposed to be making new exceptions.
</span><del>- exec->clearException();
- exec->clearLastException();
</del><ins>+ scope.clearException();
+ vm.clearLastException();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ScriptExecutionContext* scriptExecutionContext = globalObject->scriptExecutionContext();
</span><span class="lines">@@ -256,8 +263,10 @@
</span><span class="cx">
</span><span class="cx"> void reportCurrentException(ExecState* exec)
</span><span class="cx"> {
</span><del>- Exception* exception = exec->exception();
- exec->clearException();
</del><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+ Exception* exception = scope.exception();
+ scope.clearException();
</ins><span class="cx"> reportException(exec, exception);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -341,7 +350,7 @@
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><del>- if (!ec || exec->hadException())
</del><ins>+ if (!ec || scope.exception())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> throwException(exec, scope, createDOMException(exec, ec));
</span><span class="lines">@@ -352,7 +361,7 @@
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><del>- if (!ec.code || exec->hadException())
</del><ins>+ if (!ec.code || scope.exception())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> throwException(exec, scope, createDOMException(exec, ec.code, ec.message));
</span><span class="lines">@@ -362,15 +371,17 @@
</span><span class="cx">
</span><span class="cx"> bool hasIteratorMethod(JSC::ExecState& state, JSC::JSValue value)
</span><span class="cx"> {
</span><ins>+ auto& vm = state.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> if (!value.isObject())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- auto& vm = state.vm();
</del><span class="cx"> JSObject* object = JSC::asObject(value);
</span><span class="cx"> CallData callData;
</span><span class="cx"> CallType callType;
</span><span class="cx"> JSValue applyMethod = object->getMethod(&state, callData, callType, vm.propertyNames->iteratorSymbol, ASCIILiteral("Symbol.iterator property should be callable"));
</span><del>- if (vm.exception())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return !applyMethod.isUndefined();
</span><span class="lines">@@ -509,7 +520,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> double x = value.toNumber(&state);
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> switch (configuration) {
</span><span class="lines">@@ -556,7 +567,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> double x = value.toNumber(&state);
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> switch (configuration) {
</span><span class="lines">@@ -642,11 +653,14 @@
</span><span class="cx"> // http://www.w3.org/TR/WebIDL/#es-long
</span><span class="cx"> int32_t toInt32EnforceRange(ExecState& state, JSValue value)
</span><span class="cx"> {
</span><ins>+ VM& vm = state.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> if (value.isInt32())
</span><span class="cx"> return value.asInt32();
</span><span class="cx">
</span><span class="cx"> double x = value.toNumber(&state);
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return 0;
</span><span class="cx"> return enforceRange(state, x, kMinInt32, kMaxInt32);
</span><span class="cx"> }
</span><span class="lines">@@ -672,11 +686,14 @@
</span><span class="cx"> // http://www.w3.org/TR/WebIDL/#es-unsigned-long
</span><span class="cx"> uint32_t toUInt32EnforceRange(ExecState& state, JSValue value)
</span><span class="cx"> {
</span><ins>+ VM& vm = state.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> if (value.isUInt32())
</span><span class="cx"> return value.asUInt32();
</span><span class="cx">
</span><span class="cx"> double x = value.toNumber(&state);
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return 0;
</span><span class="cx"> return enforceRange(state, x, 0, kMaxUInt32);
</span><span class="cx"> }
</span><span class="lines">@@ -683,8 +700,11 @@
</span><span class="cx">
</span><span class="cx"> int64_t toInt64EnforceRange(ExecState& state, JSC::JSValue value)
</span><span class="cx"> {
</span><ins>+ VM& vm = state.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> double x = value.toNumber(&state);
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return 0;
</span><span class="cx"> return enforceRange(state, x, -kJSMaxInteger, kJSMaxInteger);
</span><span class="cx"> }
</span><span class="lines">@@ -691,8 +711,11 @@
</span><span class="cx">
</span><span class="cx"> uint64_t toUInt64EnforceRange(ExecState& state, JSC::JSValue value)
</span><span class="cx"> {
</span><ins>+ VM& vm = state.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> double x = value.toNumber(&state);
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return 0;
</span><span class="cx"> return enforceRange(state, x, 0, kJSMaxInteger);
</span><span class="cx"> }
</span><span class="lines">@@ -856,7 +879,7 @@
</span><span class="cx">
</span><span class="cx"> void throwNotSupportedError(JSC::ExecState& state, JSC::ThrowScope& scope, const char* message)
</span><span class="cx"> {
</span><del>- ASSERT(!state.hadException());
</del><ins>+ ASSERT(!scope.exception());
</ins><span class="cx"> String messageString(message);
</span><span class="cx"> throwException(&state, scope, createDOMException(&state, NOT_SUPPORTED_ERR, &messageString));
</span><span class="cx"> }
</span><span class="lines">@@ -863,7 +886,7 @@
</span><span class="cx">
</span><span class="cx"> void throwInvalidStateError(JSC::ExecState& state, JSC::ThrowScope& scope, const char* message)
</span><span class="cx"> {
</span><del>- ASSERT(!state.hadException());
</del><ins>+ ASSERT(!scope.exception());
</ins><span class="cx"> String messageString(message);
</span><span class="cx"> throwException(&state, scope, createDOMException(&state, INVALID_STATE_ERR, &messageString));
</span><span class="cx"> }
</span><span class="lines">@@ -870,7 +893,7 @@
</span><span class="cx">
</span><span class="cx"> void throwSecurityError(JSC::ExecState& state, JSC::ThrowScope& scope, const String& message)
</span><span class="cx"> {
</span><del>- ASSERT(!state.hadException());
</del><ins>+ ASSERT(!scope.exception());
</ins><span class="cx"> throwException(&state, scope, createDOMException(&state, SECURITY_ERR, message));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMBindingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMBinding.h (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -552,7 +552,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSC::JSValue lengthValue = object->get(&exec, exec.propertyNames().length);
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> if (lengthValue.isUndefinedOrNull()) {
</span><span class="lines">@@ -561,7 +561,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> length = lengthValue.toUInt32(&exec);
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> return object;
</span><span class="lines">@@ -604,8 +604,11 @@
</span><span class="cx">
</span><span class="cx"> template<typename T> inline JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, const Vector<T>& vector)
</span><span class="cx"> {
</span><ins>+ JSC::VM& vm = globalObject->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> JSC::JSArray* array = constructEmptyArray(exec, nullptr, vector.size());
</span><del>- if (UNLIKELY(exec->hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSC::jsUndefined();
</span><span class="cx"> for (size_t i = 0; i < vector.size(); ++i)
</span><span class="cx"> array->putDirectIndex(exec, i, toJS(exec, globalObject, vector[i]));
</span><span class="lines">@@ -614,8 +617,11 @@
</span><span class="cx">
</span><span class="cx"> template<typename T> inline JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, const Vector<RefPtr<T>>& vector)
</span><span class="cx"> {
</span><ins>+ JSC::VM& vm = globalObject->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> JSC::JSArray* array = constructEmptyArray(exec, nullptr, vector.size());
</span><del>- if (UNLIKELY(exec->hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSC::jsUndefined();
</span><span class="cx"> for (size_t i = 0; i < vector.size(); ++i)
</span><span class="cx"> array->putDirectIndex(exec, i, toJS(exec, globalObject, vector[i].get()));
</span><span class="lines">@@ -699,14 +705,17 @@
</span><span class="cx">
</span><span class="cx"> template<typename T, size_t inlineCapacity> JSC::JSValue jsFrozenArray(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, const Vector<T, inlineCapacity>& vector)
</span><span class="cx"> {
</span><ins>+ JSC::VM& vm = globalObject->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> JSC::MarkedArgumentBuffer list;
</span><span class="cx"> for (auto& element : vector) {
</span><span class="cx"> list.append(JSValueTraits<T>::arrayJSValue(exec, globalObject, element));
</span><del>- if (UNLIKELY(exec->hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSC::jsUndefined();
</span><span class="cx"> }
</span><span class="cx"> auto* array = JSC::constructArray(exec, nullptr, globalObject, list);
</span><del>- if (UNLIKELY(exec->hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSC::jsUndefined();
</span><span class="cx"> return JSC::objectConstructorFreeze(exec, array);
</span><span class="cx"> }
</span><span class="lines">@@ -745,8 +754,10 @@
</span><span class="cx"> template<> struct NativeValueTraits<String> {
</span><span class="cx"> static inline bool nativeValue(JSC::ExecState& exec, JSC::JSValue jsValue, String& indexedValue)
</span><span class="cx"> {
</span><ins>+ JSC::VM& vm = exec.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> indexedValue = jsValue.toWTFString(&exec);
</span><del>- return !exec.hadException();
</del><ins>+ return !scope.exception();
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -753,8 +764,10 @@
</span><span class="cx"> template<> struct NativeValueTraits<unsigned> {
</span><span class="cx"> static inline bool nativeValue(JSC::ExecState& exec, JSC::JSValue jsValue, unsigned& indexedValue)
</span><span class="cx"> {
</span><ins>+ JSC::VM& vm = exec.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> indexedValue = jsValue.toUInt32(&exec);
</span><del>- return !exec.hadException();
</del><ins>+ return !scope.exception();
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -761,8 +774,10 @@
</span><span class="cx"> template<> struct NativeValueTraits<float> {
</span><span class="cx"> static inline bool nativeValue(JSC::ExecState& exec, JSC::JSValue jsValue, float& indexedValue)
</span><span class="cx"> {
</span><ins>+ JSC::VM& vm = exec.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> indexedValue = jsValue.toFloat(&exec);
</span><del>- return !exec.hadException();
</del><ins>+ return !scope.exception();
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -769,8 +784,10 @@
</span><span class="cx"> template<> struct NativeValueTraits<double> {
</span><span class="cx"> static inline bool nativeValue(JSC::ExecState& exec, JSC::JSValue jsValue, double& indexedValue)
</span><span class="cx"> {
</span><ins>+ JSC::VM& vm = exec.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> indexedValue = jsValue.toNumber(&exec);
</span><del>- return !exec.hadException();
</del><ins>+ return !scope.exception();
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -807,11 +824,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Vector<T> result;
</span><del>- forEachInIterable(&exec, value, [&result](JSC::VM&, JSC::ExecState* state, JSC::JSValue jsValue) {
</del><ins>+ forEachInIterable(&exec, value, [&result](JSC::VM& vm, JSC::ExecState* state, JSC::JSValue jsValue) {
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> T convertedValue;
</span><del>- if (!NativeValueTraits<T>::nativeValue(*state, jsValue, convertedValue))
</del><ins>+ bool success = NativeValueTraits<T>::nativeValue(*state, jsValue, convertedValue);
+ ASSERT_UNUSED(scope, scope.exception() || success);
+ if (!success)
</ins><span class="cx"> return;
</span><del>- ASSERT(!state->hadException());
</del><span class="cx"> result.append(convertedValue);
</span><span class="cx"> });
</span><span class="cx"> return result;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMGlobalObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -75,11 +75,13 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(execState);
</span><span class="cx"> ASSERT(execState->argumentCount() == 2);
</span><ins>+ VM& vm = execState->vm();
+ auto scope = DECLARE_CATCH_SCOPE(vm);
</ins><span class="cx">
</span><span class="cx"> auto interfaceName = execState->uncheckedArgument(0).getString(execState);
</span><del>- ASSERT(!execState->hadException());
</del><ins>+ ASSERT_UNUSED(scope, !scope.exception());
</ins><span class="cx"> auto functionName = execState->uncheckedArgument(1).getString(execState);
</span><del>- ASSERT(!execState->hadException());
</del><ins>+ ASSERT(!scope.exception());
</ins><span class="cx"> return JSValue::encode(createTypeError(execState, makeThisTypeErrorMessage(interfaceName.utf8().data(), functionName.utf8().data())));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -87,11 +89,13 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(execState);
</span><span class="cx"> ASSERT(execState->argumentCount() == 2);
</span><ins>+ VM& vm = execState->vm();
+ auto scope = DECLARE_CATCH_SCOPE(vm);
</ins><span class="cx">
</span><span class="cx"> auto interfaceName = execState->uncheckedArgument(0).getString(execState);
</span><del>- ASSERT(!execState->hadException());
</del><ins>+ ASSERT_UNUSED(scope, !scope.exception());
</ins><span class="cx"> auto attributeName = execState->uncheckedArgument(1).getString(execState);
</span><del>- ASSERT(!execState->hadException());
</del><ins>+ ASSERT(!scope.exception());
</ins><span class="cx"> return JSValue::encode(createTypeError(execState, makeGetterTypeErrorMessage(interfaceName.utf8().data(), attributeName.utf8().data())));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMGlobalObjectTaskcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMGlobalObjectTask.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMGlobalObjectTask.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSDOMGlobalObjectTask.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -49,7 +49,9 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> Ref<JSGlobalObjectCallback> protectedThis(*this);
</span><del>- JSLockHolder lock(m_globalObject->vm());
</del><ins>+ VM& vm = m_globalObject->vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx">
</span><span class="cx"> ExecState* exec = m_globalObject->globalExec();
</span><span class="cx">
</span><span class="lines">@@ -64,7 +66,7 @@
</span><span class="cx"> JSMainThreadExecState::runTask(exec, m_task);
</span><span class="cx"> else
</span><span class="cx"> m_task->run(exec);
</span><del>- ASSERT(!exec->hadException());
</del><ins>+ ASSERT_UNUSED(scope, !scope.exception());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMIteratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMIterator.h (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMIterator.h 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSDOMIterator.h 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -205,7 +205,7 @@
</span><span class="cx"> appendForEachArguments(state, wrapper->globalObject(), arguments, value);
</span><span class="cx"> arguments.append(wrapper);
</span><span class="cx"> JSC::call(&state, callback, callType, callData, thisValue, arguments);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> return JSC::JSValue::encode(JSC::jsUndefined());
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMPromisecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMPromise.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMPromise.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSDOMPromise.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -100,11 +100,14 @@
</span><span class="cx">
</span><span class="cx"> void rejectPromiseWithExceptionIfAny(JSC::ExecState& state, JSDOMGlobalObject& globalObject, JSPromiseDeferred& promiseDeferred)
</span><span class="cx"> {
</span><del>- if (!state.hadException())
</del><ins>+ VM& vm = state.vm();
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
+ if (!scope.exception())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- JSValue error = state.exception()->value();
- state.clearException();
</del><ins>+ JSValue error = scope.exception()->value();
+ scope.clearException();
</ins><span class="cx">
</span><span class="cx"> DeferredWrapper::create(&state, &globalObject, &promiseDeferred)->reject(error);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMPromiseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMPromise.h (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMPromise.h 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSDOMPromise.h 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -158,12 +158,15 @@
</span><span class="cx">
</span><span class="cx"> inline JSC::JSValue callPromiseFunction(JSC::ExecState& state, JSC::EncodedJSValue promiseFunction(JSC::ExecState*, JSC::JSPromiseDeferred*))
</span><span class="cx"> {
</span><ins>+ JSC::VM& vm = state.vm();
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
</ins><span class="cx"> JSDOMGlobalObject& globalObject = *JSC::jsCast<JSDOMGlobalObject*>(state.lexicalGlobalObject());
</span><span class="cx"> JSC::JSPromiseDeferred& promiseDeferred = *JSC::JSPromiseDeferred::create(&state, &globalObject);
</span><span class="cx"> promiseFunction(&state, &promiseDeferred);
</span><span class="cx">
</span><span class="cx"> rejectPromiseWithExceptionIfAny(state, globalObject, promiseDeferred);
</span><del>- ASSERT(!state.hadException());
</del><ins>+ ASSERT_UNUSED(scope, !scope.exception());
</ins><span class="cx"> return promiseDeferred.promise();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMStringMapCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMStringMapCustom.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMStringMapCustom.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSDOMStringMapCustom.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -75,11 +75,14 @@
</span><span class="cx">
</span><span class="cx"> bool JSDOMStringMap::putDelegate(ExecState* exec, PropertyName propertyName, JSValue value, PutPropertySlot&, bool& putResult)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> if (propertyName.isSymbol())
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> String stringValue = value.toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> ExceptionCode ec = 0;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMWindowBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -197,13 +197,15 @@
</span><span class="cx"> void call()
</span><span class="cx"> {
</span><span class="cx"> Ref<JSDOMWindowMicrotaskCallback> protectedThis(*this);
</span><del>- JSLockHolder lock(m_globalObject->vm());
</del><ins>+ VM& vm = m_globalObject->vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx">
</span><span class="cx"> ExecState* exec = m_globalObject->globalExec();
</span><span class="cx">
</span><span class="cx"> JSMainThreadExecState::runTask(exec, m_task);
</span><span class="cx">
</span><del>- ASSERT(!exec->hadException());
</del><ins>+ ASSERT_UNUSED(scope, !scope.exception());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMWindowCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -369,6 +369,9 @@
</span><span class="cx">
</span><span class="cx"> void JSDOMWindow::setLocation(ExecState& state, JSValue value)
</span><span class="cx"> {
</span><ins>+ VM& vm = state.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> #if ENABLE(DASHBOARD_SUPPORT)
</span><span class="cx"> // To avoid breaking old widgets, make "var location =" in a top-level frame create
</span><span class="cx"> // a property named "location" instead of performing a navigation (<rdar://problem/5688039>).
</span><span class="lines">@@ -382,7 +385,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> String locationString = value.toString(&state)->value(&state);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (Location* location = wrapped().location())
</span><span class="lines">@@ -406,15 +409,18 @@
</span><span class="cx">
</span><span class="cx"> JSValue JSDOMWindow::open(ExecState& state)
</span><span class="cx"> {
</span><ins>+ VM& vm = state.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> String urlString = valueToUSVStringWithUndefinedOrNullCheck(&state, state.argument(0));
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> JSValue targetValue = state.argument(1);
</span><span class="cx"> AtomicString target = targetValue.isUndefinedOrNull() ? AtomicString("_blank", AtomicString::ConstructFromLiteral) : targetValue.toString(&state)->toAtomicString(&state);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> String windowFeaturesString = valueToStringWithUndefinedOrNullCheck(&state, state.argument(2));
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> RefPtr<DOMWindow> openedWindow = wrapped().open(urlString, target, windowFeaturesString, activeDOMWindow(&state), firstDOMWindow(&state));
</span><span class="lines">@@ -470,10 +476,10 @@
</span><span class="cx"> return throwException(&state, scope, createNotEnoughArgumentsError(&state));
</span><span class="cx">
</span><span class="cx"> String urlString = valueToStringWithUndefinedOrNullCheck(&state, state.argument(0));
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> String dialogFeaturesString = valueToStringWithUndefinedOrNullCheck(&state, state.argument(2));
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> DialogHandler handler(state);
</span><span class="lines">@@ -511,16 +517,16 @@
</span><span class="cx"> }
</span><span class="cx"> fillMessagePortArray(state, state.argument(transferablesArgIndex), messagePorts, arrayBuffers);
</span><span class="cx"> }
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> auto message = SerializedScriptValue::create(&state, state.uncheckedArgument(0), &messagePorts, &arrayBuffers);
</span><span class="cx">
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> String targetOrigin = valueToUSVStringWithUndefinedOrNullCheck(&state, state.uncheckedArgument(targetOriginArgIndex));
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="lines">@@ -545,7 +551,7 @@
</span><span class="cx">
</span><span class="cx"> ContentSecurityPolicy* contentSecurityPolicy = wrapped().document() ? wrapped().document()->contentSecurityPolicy() : nullptr;
</span><span class="cx"> std::unique_ptr<ScheduledAction> action = ScheduledAction::create(&state, globalObject()->world(), contentSecurityPolicy);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> if (!action)
</span><span class="lines">@@ -570,7 +576,7 @@
</span><span class="cx">
</span><span class="cx"> ContentSecurityPolicy* contentSecurityPolicy = wrapped().document() ? wrapped().document()->contentSecurityPolicy() : nullptr;
</span><span class="cx"> std::unique_ptr<ScheduledAction> action = ScheduledAction::create(&state, globalObject()->world(), contentSecurityPolicy);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> int delay = state.argument(1).toInt32(&state);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDataCueCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDataCueCustom.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDataCueCustom.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSDataCueCustom.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -58,11 +58,11 @@
</span><span class="cx"> return throwVMError(&exec, scope, createNotEnoughArgumentsError(&exec));
</span><span class="cx">
</span><span class="cx"> double startTime(exec.uncheckedArgument(0).toNumber(&exec));
</span><del>- if (UNLIKELY(exec.hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> double endTime(exec.uncheckedArgument(1).toNumber(&exec));
</span><del>- if (UNLIKELY(exec.hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> ScriptExecutionContext* context = castedThis->scriptExecutionContext();
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> if (valueArgument.isCell() && valueArgument.asCell()->inherits(std::remove_pointer<JSArrayBuffer*>::type::info())) {
</span><span class="cx">
</span><span class="cx"> ArrayBuffer* data = toArrayBuffer(valueArgument);
</span><del>- if (UNLIKELY(exec.hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> if (UNLIKELY(!data)) {
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDeviceMotionEventCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDeviceMotionEventCustom.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDeviceMotionEventCustom.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSDeviceMotionEventCustom.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -47,32 +47,35 @@
</span><span class="cx"> if (value.isUndefinedOrNull())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><ins>+ VM& vm = state.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> // Given the above test, this will always yield an object.
</span><span class="cx"> JSObject* object = value.toObject(&state);
</span><del>- ASSERT(!state.hadException());
</del><ins>+ ASSERT(!scope.exception());
</ins><span class="cx">
</span><span class="cx"> JSValue xValue = object->get(&state, Identifier::fromString(&state, "x"));
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> bool canProvideX = !xValue.isUndefinedOrNull();
</span><span class="cx"> double x = xValue.toNumber(&state);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> JSValue yValue = object->get(&state, Identifier::fromString(&state, "y"));
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> bool canProvideY = !yValue.isUndefinedOrNull();
</span><span class="cx"> double y = yValue.toNumber(&state);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> JSValue zValue = object->get(&state, Identifier::fromString(&state, "z"));
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> bool canProvideZ = !zValue.isUndefinedOrNull();
</span><span class="cx"> double z = zValue.toNumber(&state);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> if (!canProvideX && !canProvideY && !canProvideZ)
</span><span class="lines">@@ -86,32 +89,35 @@
</span><span class="cx"> if (value.isUndefinedOrNull())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><ins>+ VM& vm = state.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> // Given the above test, this will always yield an object.
</span><span class="cx"> JSObject* object = value.toObject(&state);
</span><del>- ASSERT(!state.hadException());
</del><ins>+ ASSERT(!scope.exception());
</ins><span class="cx">
</span><span class="cx"> JSValue alphaValue = object->get(&state, Identifier::fromString(&state, "alpha"));
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> bool canProvideAlpha = !alphaValue.isUndefinedOrNull();
</span><span class="cx"> double alpha = alphaValue.toNumber(&state);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> JSValue betaValue = object->get(&state, Identifier::fromString(&state, "beta"));
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> bool canProvideBeta = !betaValue.isUndefinedOrNull();
</span><span class="cx"> double beta = betaValue.toNumber(&state);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> JSValue gammaValue = object->get(&state, Identifier::fromString(&state, "gamma"));
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> bool canProvideGamma = !gammaValue.isUndefinedOrNull();
</span><span class="cx"> double gamma = gammaValue.toNumber(&state);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> if (!canProvideAlpha && !canProvideBeta && !canProvideGamma)
</span><span class="lines">@@ -172,6 +178,9 @@
</span><span class="cx">
</span><span class="cx"> JSValue JSDeviceMotionEvent::initDeviceMotionEvent(ExecState& state)
</span><span class="cx"> {
</span><ins>+ VM& vm = state.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> const String type = state.argument(0).toString(&state)->value(&state);
</span><span class="cx"> bool bubbles = state.argument(1).toBoolean(&state);
</span><span class="cx"> bool cancelable = state.argument(2).toBoolean(&state);
</span><span class="lines">@@ -179,15 +188,15 @@
</span><span class="cx"> // If any of the parameters are null or undefined, mark them as not provided.
</span><span class="cx"> // Otherwise, use the standard JavaScript conversion.
</span><span class="cx"> RefPtr<DeviceMotionData::Acceleration> acceleration = readAccelerationArgument(state.argument(3), state);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> RefPtr<DeviceMotionData::Acceleration> accelerationIncludingGravity = readAccelerationArgument(state.argument(4), state);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> RefPtr<DeviceMotionData::RotationRate> rotationRate = readRotationRateArgument(state.argument(5), state);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> bool intervalProvided = !state.argument(6).isUndefinedOrNull();
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDictionarycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDictionary.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDictionary.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSDictionary.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -78,6 +78,8 @@
</span><span class="cx">
</span><span class="cx"> JSDictionary::GetPropertyResult JSDictionary::tryGetProperty(const char* propertyName, JSValue& finalResult) const
</span><span class="cx"> {
</span><ins>+ VM& vm = m_exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> ASSERT(isValid());
</span><span class="cx"> Identifier identifier = Identifier::fromString(m_exec, propertyName);
</span><span class="cx"> bool propertyFound = m_initializerObject.get()->getPropertySlot(m_exec, identifier, [&] (bool propertyFound, PropertySlot& slot) -> bool {
</span><span class="lines">@@ -86,7 +88,7 @@
</span><span class="cx"> finalResult = slot.getValue(m_exec, identifier);
</span><span class="cx"> return true;
</span><span class="cx"> });
</span><del>- if (m_exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return ExceptionThrown;
</span><span class="cx"> return propertyFound ? PropertyFound : NoPropertyFound;
</span><span class="cx"> }
</span><span class="lines">@@ -151,17 +153,20 @@
</span><span class="cx"> void JSDictionary::convertValue(ExecState* exec, JSValue value, Vector<String>& result)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(exec);
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> if (value.isUndefinedOrNull())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> unsigned length = 0;
</span><span class="cx"> JSObject* object = toJSSequence(*exec, value, length);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> for (unsigned i = 0 ; i < length; ++i) {
</span><span class="cx"> JSValue itemValue = object->get(exec, i);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> result.append(itemValue.toString(exec)->value(exec));
</span><span class="cx"> }
</span><span class="lines">@@ -221,6 +226,9 @@
</span><span class="cx"> void JSDictionary::convertValue(ExecState* exec, JSValue value, HashSet<AtomicString>& result)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(exec);
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> result.clear();
</span><span class="cx">
</span><span class="cx"> if (value.isUndefinedOrNull())
</span><span class="lines">@@ -228,12 +236,12 @@
</span><span class="cx">
</span><span class="cx"> unsigned length = 0;
</span><span class="cx"> JSObject* object = toJSSequence(*exec, value, length);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> for (unsigned i = 0 ; i < length; ++i) {
</span><span class="cx"> JSValue itemValue = object->get(exec, i);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> result.add(itemValue.toString(exec)->value(exec));
</span><span class="cx"> }
</span><span class="lines">@@ -297,17 +305,20 @@
</span><span class="cx"> void JSDictionary::convertValue(ExecState* exec, JSValue value, Vector<RefPtr<MediaStream>>& result)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(exec);
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> if (value.isUndefinedOrNull())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> unsigned length = 0;
</span><span class="cx"> JSObject* object = toJSSequence(*exec, value, length);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> for (unsigned i = 0 ; i < length; ++i) {
</span><span class="cx"> JSValue itemValue = object->get(exec, i);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> auto stream = JSMediaStream::toWrapped(itemValue);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDictionaryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDictionary.h (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDictionary.h 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSDictionary.h 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -203,6 +203,9 @@
</span><span class="cx"> template <typename T, typename Result>
</span><span class="cx"> JSDictionary::GetPropertyResult JSDictionary::tryGetPropertyAndResult(const char* propertyName, T* context, void (*setter)(T* context, const Result&)) const
</span><span class="cx"> {
</span><ins>+ JSC::VM& vm = m_exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> JSC::JSValue value;
</span><span class="cx"> GetPropertyResult getPropertyResult = tryGetProperty(propertyName, value);
</span><span class="cx"> switch (getPropertyResult) {
</span><span class="lines">@@ -212,7 +215,7 @@
</span><span class="cx"> Result result;
</span><span class="cx"> convertValue(m_exec, value, result);
</span><span class="cx">
</span><del>- if (m_exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return ExceptionThrown;
</span><span class="cx">
</span><span class="cx"> setter(context, result);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDocumentCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -153,16 +153,16 @@
</span><span class="cx"> if (UNLIKELY(state.argumentCount() < 4))
</span><span class="cx"> return throwException(&state, scope, createNotEnoughArgumentsError(&state));
</span><span class="cx"> auto contextId = state.uncheckedArgument(0).toWTFString(&state);
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> auto name = state.uncheckedArgument(1).toWTFString(&state);
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> auto width = convert<int32_t>(state, state.uncheckedArgument(2), NormalConversion);
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> auto height = convert<int32_t>(state, state.uncheckedArgument(3), NormalConversion);
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> auto* context = wrapped().getCSSCanvasContext(WTFMove(contextId), WTFMove(name), WTFMove(width), WTFMove(height));
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSEventListenercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSEventListener.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSEventListener.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSEventListener.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -79,7 +79,12 @@
</span><span class="cx"> if (!scriptExecutionContext || scriptExecutionContext->isJSExecutionForbidden())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- JSLockHolder lock(scriptExecutionContext->vm());
</del><ins>+ VM& vm = scriptExecutionContext->vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+ // See https://dom.spec.whatwg.org/#dispatching-events spec on calling handleEvent.
+ // "If this throws an exception, report the exception." It should not propagate the
+ // exception.
</ins><span class="cx">
</span><span class="cx"> JSObject* jsFunction = this->jsFunction(scriptExecutionContext);
</span><span class="cx"> if (!jsFunction)
</span><span class="lines">@@ -109,6 +114,14 @@
</span><span class="cx"> // If jsFunction is not actually a function, see if it implements the EventListener interface and use that
</span><span class="cx"> if (callType == CallType::None) {
</span><span class="cx"> handleEventFunction = jsFunction->get(exec, Identifier::fromString(exec, "handleEvent"));
</span><ins>+ if (UNLIKELY(scope.exception())) {
+ Exception* exception = scope.exception();
+ scope.clearException();
+
+ event->target()->uncaughtExceptionInEventHandler();
+ reportException(exec, exception);
+ return;
+ }
</ins><span class="cx"> callType = getCallData(handleEventFunction, callData);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -121,7 +134,6 @@
</span><span class="cx"> Event* savedEvent = globalObject->currentEvent();
</span><span class="cx"> globalObject->setCurrentEvent(event);
</span><span class="cx">
</span><del>- VM& vm = globalObject->vm();
</del><span class="cx"> VMEntryScope entryScope(vm, vm.entryScope ? vm.entryScope->globalObject() : globalObject);
</span><span class="cx">
</span><span class="cx"> InspectorInstrumentationCookie cookie = JSMainThreadExecState::instrumentFunctionCall(scriptExecutionContext, callType, callData);
</span><span class="lines">@@ -138,7 +150,7 @@
</span><span class="cx">
</span><span class="cx"> if (is<WorkerGlobalScope>(*scriptExecutionContext)) {
</span><span class="cx"> auto scriptController = downcast<WorkerGlobalScope>(*scriptExecutionContext).script();
</span><del>- bool terminatorCausedException = (exec->hadException() && isTerminatedExecutionException(exec->exception()));
</del><ins>+ bool terminatorCausedException = (scope.exception() && isTerminatedExecutionException(scope.exception()));
</ins><span class="cx"> if (terminatorCausedException || scriptController->isTerminatingExecution())
</span><span class="cx"> scriptController->forbidExecution();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSFileCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSFileCustom.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSFileCustom.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSFileCustom.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx">
</span><span class="cx"> unsigned blobPartsLength = 0;
</span><span class="cx"> JSObject* blobParts = toJSSequence(exec, arg, blobPartsLength);
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> ASSERT(blobParts);
</span><span class="cx">
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> return throwArgumentTypeError(exec, scope, 1, "filename", "File", nullptr, "DOMString");
</span><span class="cx">
</span><span class="cx"> String filename = arg.toWTFString(&exec).replace('/', ':');
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> String normalizedType;
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> // Attempt to get the type property.
</span><span class="cx"> String type;
</span><span class="cx"> dictionary.get("type", type);
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> normalizedType = Blob::normalizedContentType(type);
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> // Only try to parse the lastModified date if there was not an invalid type argument.
</span><span class="cx"> if (type.isEmpty() || !normalizedType.isEmpty()) {
</span><span class="cx"> dictionary.get("lastModified", lastModified);
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < blobPartsLength; ++i) {
</span><span class="cx"> JSValue item = blobParts->get(&exec, i);
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> if (ArrayBuffer* arrayBuffer = toArrayBuffer(item))
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> blobBuilder.append(blob);
</span><span class="cx"> else {
</span><span class="cx"> String string = item.toWTFString(&exec);
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> blobBuilder.append(string, ASCIILiteral("transparent"));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSGeolocationCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSGeolocationCustom.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSGeolocationCustom.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSGeolocationCustom.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -71,6 +71,9 @@
</span><span class="cx">
</span><span class="cx"> static RefPtr<PositionOptions> createPositionOptions(ExecState* exec, JSValue value)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> // Create default options.
</span><span class="cx"> auto options = PositionOptions::create();
</span><span class="cx">
</span><span class="lines">@@ -82,7 +85,7 @@
</span><span class="cx">
</span><span class="cx"> // Given the above test, this will always yield an object.
</span><span class="cx"> JSObject* object = value.toObject(exec);
</span><del>- ASSERT(!exec->hadException());
</del><ins>+ ASSERT_UNUSED(scope, !scope.exception());
</ins><span class="cx">
</span><span class="cx"> // Create the dictionary wrapper from the initializer object.
</span><span class="cx"> JSDictionary dictionary(exec, object);
</span><span class="lines">@@ -99,19 +102,22 @@
</span><span class="cx">
</span><span class="cx"> JSValue JSGeolocation::getCurrentPosition(ExecState& state)
</span><span class="cx"> {
</span><ins>+ VM& vm = state.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> // Arguments: PositionCallback, (optional)PositionErrorCallback, (optional)PositionOptions
</span><span class="cx">
</span><span class="cx"> auto positionCallback = createFunctionOnlyCallback<JSPositionCallback>(&state, globalObject(), state.argument(0));
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> ASSERT(positionCallback);
</span><span class="cx">
</span><span class="cx"> auto positionErrorCallback = createFunctionOnlyCallback<JSPositionErrorCallback>(&state, globalObject(), state.argument(1), CallbackAllowUndefined | CallbackAllowNull);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> auto positionOptions = createPositionOptions(&state, state.argument(2));
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> ASSERT(positionOptions);
</span><span class="cx">
</span><span class="lines">@@ -121,19 +127,22 @@
</span><span class="cx">
</span><span class="cx"> JSValue JSGeolocation::watchPosition(ExecState& state)
</span><span class="cx"> {
</span><ins>+ VM& vm = state.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> // Arguments: PositionCallback, (optional)PositionErrorCallback, (optional)PositionOptions
</span><span class="cx">
</span><span class="cx"> auto positionCallback = createFunctionOnlyCallback<JSPositionCallback>(&state, globalObject(), state.argument(0));
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> ASSERT(positionCallback);
</span><span class="cx">
</span><span class="cx"> auto positionErrorCallback = createFunctionOnlyCallback<JSPositionErrorCallback>(&state, globalObject(), state.argument(1), CallbackAllowUndefined | CallbackAllowNull);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> auto positionOptions = createPositionOptions(&state, state.argument(2));
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> ASSERT(positionOptions);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSHTMLAllCollectionCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSHTMLAllCollectionCustom.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSHTMLAllCollectionCustom.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSHTMLAllCollectionCustom.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -53,6 +53,9 @@
</span><span class="cx"> // HTMLAllCollections are strange objects, they support both get and call.
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL callHTMLAllCollection(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> if (exec->argumentCount() < 1)
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="lines">@@ -65,7 +68,7 @@
</span><span class="cx"> if (exec->argumentCount() == 1) {
</span><span class="cx"> // Support for document.all(<index>) etc.
</span><span class="cx"> String string = exec->argument(0).toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> if (Optional<uint32_t> index = parseIndex(*string.impl()))
</span><span class="cx"> return JSValue::encode(toJS(exec, jsCollection->globalObject(), collection.item(index.value())));
</span><span class="lines">@@ -76,7 +79,7 @@
</span><span class="cx">
</span><span class="cx"> // The second arg, if set, is the index of the item we want
</span><span class="cx"> String string = exec->argument(0).toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> if (Optional<uint32_t> index = parseIndex(*exec->argument(1).toWTFString(exec).impl())) {
</span><span class="cx"> if (auto* item = collection.namedItemWithIndex(string, index.value()))
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSHTMLCanvasElementCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSHTMLCanvasElementCustom.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSHTMLCanvasElementCustom.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSHTMLCanvasElementCustom.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -46,12 +46,15 @@
</span><span class="cx"> #if ENABLE(WEBGL)
</span><span class="cx"> static void get3DContextAttributes(ExecState& state, RefPtr<CanvasContextAttributes>& attrs)
</span><span class="cx"> {
</span><ins>+ VM& vm = state.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> JSValue initializerValue = state.argument(1);
</span><span class="cx"> if (initializerValue.isUndefinedOrNull())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> JSObject* initializerObject = initializerValue.toObject(&state);
</span><del>- ASSERT(!state.hadException());
</del><ins>+ ASSERT_UNUSED(scope, !scope.exception());
</ins><span class="cx"> JSDictionary dictionary(&state, initializerObject);
</span><span class="cx">
</span><span class="cx"> GraphicsContext3D::Attributes graphicsAttrs;
</span><span class="lines">@@ -83,7 +86,7 @@
</span><span class="cx"> #if ENABLE(WEBGL)
</span><span class="cx"> if (HTMLCanvasElement::is3dType(contextId)) {
</span><span class="cx"> get3DContextAttributes(state, attrs);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSHTMLElementCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSHTMLElementCustom.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSHTMLElementCustom.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSHTMLElementCustom.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> if (!elementInterface->isUpgradingElement()) {
</span><span class="cx"> Structure* baseStructure = getDOMStructure<JSHTMLElement>(vm, *globalObject);
</span><span class="cx"> auto* newElementStructure = InternalFunction::createSubclassStructure(&exec, newTargetValue, baseStructure);
</span><del>- if (UNLIKELY(exec.hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> Ref<HTMLElement> element = HTMLElement::create(elementInterface->name(), document);
</span><span class="lines">@@ -98,12 +98,12 @@
</span><span class="cx"> ASSERT(elementWrapperValue.isObject());
</span><span class="cx">
</span><span class="cx"> JSValue newPrototype = newTarget->get(&exec, vm.propertyNames->prototype);
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> JSObject* elementWrapperObject = asObject(elementWrapperValue);
</span><span class="cx"> JSObject::setPrototype(elementWrapperObject, &exec, newPrototype, true /* shouldThrowIfCantSet */);
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> elementInterface->didUpgradeLastElementInConstructionStack();
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSHistoryCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSHistoryCustom.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSHistoryCustom.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSHistoryCustom.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -63,18 +63,18 @@
</span><span class="cx"> return throwException(&state, scope, createNotEnoughArgumentsError(&state));
</span><span class="cx">
</span><span class="cx"> auto historyState = SerializedScriptValue::create(&state, state.uncheckedArgument(0), 0, 0);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> // FIXME: title should not be nullable.
</span><span class="cx"> String title = valueToStringWithUndefinedOrNullCheck(&state, state.uncheckedArgument(1));
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> String url;
</span><span class="cx"> if (argCount > 2) {
</span><span class="cx"> url = valueToUSVStringWithUndefinedOrNullCheck(&state, state.uncheckedArgument(2));
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -97,18 +97,18 @@
</span><span class="cx"> return throwException(&state, scope, createNotEnoughArgumentsError(&state));
</span><span class="cx">
</span><span class="cx"> auto historyState = SerializedScriptValue::create(&state, state.uncheckedArgument(0), 0, 0);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> // FIXME: title should not be nullable.
</span><span class="cx"> String title = valueToStringWithUndefinedOrNullCheck(&state, state.uncheckedArgument(1));
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> String url;
</span><span class="cx"> if (argCount > 2) {
</span><span class="cx"> url = valueToUSVStringWithUndefinedOrNullCheck(&state, state.uncheckedArgument(2));
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSIDBDatabaseCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSIDBDatabaseCustom.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSIDBDatabaseCustom.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSIDBDatabaseCustom.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> return throwException(&state, scope, createNotEnoughArgumentsError(&state));
</span><span class="cx">
</span><span class="cx"> String name = state.argument(0).toString(&state)->value(&state);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> JSValue optionsValue = state.argument(1);
</span><span class="lines">@@ -66,17 +66,17 @@
</span><span class="cx"> bool autoIncrement = false;
</span><span class="cx"> if (!optionsValue.isUndefinedOrNull()) {
</span><span class="cx"> JSValue keyPathValue = optionsValue.get(&state, Identifier::fromString(&state, "keyPath"));
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> if (!keyPathValue.isUndefinedOrNull()) {
</span><span class="cx"> keyPath = idbKeyPathFromValue(state, keyPathValue);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> autoIncrement = optionsValue.get(&state, Identifier::fromString(&state, "autoIncrement")).toBoolean(&state);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSLazyEventListenercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSLazyEventListener.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSLazyEventListener.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSLazyEventListener.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -98,6 +98,9 @@
</span><span class="cx"> if (!globalObject)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><ins>+ VM& vm = globalObject->vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
</ins><span class="cx"> ExecState* exec = globalObject->globalExec();
</span><span class="cx">
</span><span class="cx"> MarkedArgumentBuffer args;
</span><span class="lines">@@ -112,9 +115,9 @@
</span><span class="cx"> exec, exec->lexicalGlobalObject(), args, Identifier::fromString(exec, m_functionName),
</span><span class="cx"> m_sourceURL, m_sourcePosition, overrideLineNumber);
</span><span class="cx">
</span><del>- if (exec->hadException()) {
</del><ins>+ if (UNLIKELY(scope.exception())) {
</ins><span class="cx"> reportCurrentException(exec);
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -123,14 +126,13 @@
</span><span class="cx"> if (m_originalNode) {
</span><span class="cx"> if (!wrapper()) {
</span><span class="cx"> // Ensure that 'node' has a JavaScript wrapper to mark the event listener we're creating.
</span><del>- JSLockHolder lock(exec);
</del><span class="cx"> // FIXME: Should pass the global object associated with the node
</span><del>- setWrapper(exec->vm(), asObject(toJS(exec, globalObject, *m_originalNode)));
</del><ins>+ setWrapper(vm, asObject(toJS(exec, globalObject, *m_originalNode)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Add the event's home element to the scope
</span><span class="cx"> // (and the document, and the form - see JSHTMLElement::eventHandlerScope)
</span><del>- listenerAsFunction->setScope(exec->vm(), jsCast<JSNode*>(wrapper())->pushEventHandlerScope(exec, listenerAsFunction->scope()));
</del><ins>+ listenerAsFunction->setScope(vm, jsCast<JSNode*>(wrapper())->pushEventHandlerScope(exec, listenerAsFunction->scope()));
</ins><span class="cx"> }
</span><span class="cx"> return jsFunction;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSMainThreadExecStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSMainThreadExecState.h (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSMainThreadExecState.h 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSMainThreadExecState.h 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -107,11 +107,14 @@
</span><span class="cx">
</span><span class="cx"> static JSC::JSValue linkAndEvaluateModule(JSC::ExecState* exec, const JSC::Identifier& moduleKey, JSC::JSValue initiator, NakedPtr<JSC::Exception>& returnedException)
</span><span class="cx"> {
</span><ins>+ JSC::VM& vm = exec->vm();
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
</ins><span class="cx"> JSMainThreadExecState currentState(exec);
</span><span class="cx"> JSC::JSValue returnValue = JSC::linkAndEvaluateModule(exec, moduleKey, initiator);
</span><del>- if (exec->hadException()) {
- returnedException = exec->vm().exception();
- exec->clearException();
</del><ins>+ if (UNLIKELY(scope.exception())) {
+ returnedException = scope.exception();
+ scope.clearException();
</ins><span class="cx"> return JSC::jsUndefined();
</span><span class="cx"> }
</span><span class="cx"> return returnValue;
</span><span class="lines">@@ -131,8 +134,10 @@
</span><span class="cx">
</span><span class="cx"> ~JSMainThreadExecState()
</span><span class="cx"> {
</span><ins>+ JSC::VM& vm = s_mainThreadState->vm();
+ auto scope = DECLARE_CATCH_SCOPE(vm);
</ins><span class="cx"> ASSERT(isMainThread());
</span><del>- ASSERT(!s_mainThreadState->hadException());
</del><ins>+ ASSERT_UNUSED(scope, !scope.exception());
</ins><span class="cx">
</span><span class="cx"> bool didExitJavaScript = s_mainThreadState && !m_previousState;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSMessageEventCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSMessageEventCustom.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSMessageEventCustom.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSMessageEventCustom.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -104,6 +104,9 @@
</span><span class="cx">
</span><span class="cx"> static JSC::JSValue handleInitMessageEvent(JSMessageEvent* jsEvent, JSC::ExecState& state)
</span><span class="cx"> {
</span><ins>+ VM& vm = state.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> const String& typeArg = state.argument(0).toString(&state)->value(&state);
</span><span class="cx"> bool canBubbleArg = state.argument(1).toBoolean(&state);
</span><span class="cx"> bool cancelableArg = state.argument(2).toBoolean(&state);
</span><span class="lines">@@ -116,16 +119,16 @@
</span><span class="cx"> messagePorts = std::make_unique<MessagePortArray>();
</span><span class="cx"> arrayBuffers = std::make_unique<ArrayBufferArray>();
</span><span class="cx"> fillMessagePortArray(state, state.argument(7), *messagePorts, *arrayBuffers);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><del>- Deprecated::ScriptValue dataArg(state.vm(), state.argument(3));
- if (state.hadException())
</del><ins>+ Deprecated::ScriptValue dataArg(vm, state.argument(3));
+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> MessageEvent& event = jsEvent->wrapped();
</span><span class="cx"> event.initMessageEvent(typeArg, canBubbleArg, cancelableArg, dataArg, originArg, lastEventIdArg, sourceArg, WTFMove(messagePorts));
</span><del>- jsEvent->m_data.set(state.vm(), jsEvent, dataArg.jsValue());
</del><ins>+ jsEvent->m_data.set(vm, jsEvent, dataArg.jsValue());
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSMessagePortCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSMessagePortCustom.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSMessagePortCustom.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSMessagePortCustom.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -73,12 +73,12 @@
</span><span class="cx"> // Validation of sequence types, per WebIDL spec 4.1.13.
</span><span class="cx"> unsigned length = 0;
</span><span class="cx"> JSObject* object = toJSSequence(state, value, length);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> for (unsigned i = 0 ; i < length; ++i) {
</span><span class="cx"> JSValue value = object->get(&state, i);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> // Validation of non-null objects, per HTML5 spec 10.3.3.
</span><span class="cx"> if (value.isUndefinedOrNull()) {
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSMessagePortCustomh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSMessagePortCustom.h (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSMessagePortCustom.h 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSMessagePortCustom.h 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> ArrayBufferArray arrayBufferArray;
</span><span class="cx"> fillMessagePortArray(state, state.argument(1), portArray, arrayBufferArray);
</span><span class="cx"> auto message = SerializedScriptValue::create(&state, state.uncheckedArgument(0), &portArray, &arrayBufferArray);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSC::jsUndefined();
</span><span class="cx">
</span><span class="cx"> ExceptionCode ec = 0;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSMockContentFilterSettingsCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSMockContentFilterSettingsCustom.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSMockContentFilterSettingsCustom.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSMockContentFilterSettingsCustom.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> uint8_t nativeValue { convert<uint8_t>(state, value, EnforceRange) };
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> DecisionPoint decisionPoint { static_cast<DecisionPoint>(nativeValue) };
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> uint8_t nativeValue { convert<uint8_t>(state, value, EnforceRange) };
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return Decision::Allow;
</span><span class="cx">
</span><span class="cx"> Decision decision { static_cast<Decision>(nativeValue) };
</span><span class="lines">@@ -119,8 +119,11 @@
</span><span class="cx">
</span><span class="cx"> void JSMockContentFilterSettings::setDecision(ExecState& state, JSValue value)
</span><span class="cx"> {
</span><ins>+ VM& vm = state.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> Decision decision { toDecision(state, value) };
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> wrapped().setDecision(decision);
</span><span class="lines">@@ -133,8 +136,11 @@
</span><span class="cx">
</span><span class="cx"> void JSMockContentFilterSettings::setUnblockRequestDecision(ExecState& state, JSValue value)
</span><span class="cx"> {
</span><ins>+ VM& vm = state.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> Decision unblockRequestDecision { toDecision(state, value) };
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> wrapped().setUnblockRequestDecision(unblockRequestDecision);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSNodeFilterCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSNodeFilterCustom.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSNodeFilterCustom.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSNodeFilterCustom.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -49,11 +49,12 @@
</span><span class="cx"> ExecState* state = m_data->globalObject()->globalExec();
</span><span class="cx"> MarkedArgumentBuffer args;
</span><span class="cx"> args.append(toJS(state, m_data->globalObject(), node));
</span><del>- if (state->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return NodeFilter::FILTER_REJECT;
</span><span class="cx">
</span><span class="cx"> NakedPtr<Exception> returnedException;
</span><span class="cx"> JSValue value = m_data->invokeCallback(args, JSCallbackData::CallbackType::FunctionOrObject, Identifier::fromString(state, "acceptNode"), returnedException);
</span><ins>+ ASSERT(!scope.exception() || returnedException);
</ins><span class="cx"> if (returnedException) {
</span><span class="cx"> // Rethrow exception.
</span><span class="cx"> throwException(state, scope, returnedException);
</span><span class="lines">@@ -62,7 +63,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> uint16_t result = convert<uint16_t>(*state, value, NormalConversion);
</span><del>- if (state->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return NodeFilter::FILTER_REJECT;
</span><span class="cx">
</span><span class="cx"> return result;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSNodeOrStringcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSNodeOrString.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSNodeOrString.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSNodeOrString.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "JSNode.h"
</span><span class="cx"> #include <JavaScriptCore/JSString.h>
</span><ins>+#include <JavaScriptCore/ThrowScope.h>
</ins><span class="cx">
</span><span class="cx"> using namespace JSC;
</span><span class="cx">
</span><span class="lines">@@ -35,6 +36,9 @@
</span><span class="cx">
</span><span class="cx"> Vector<std::experimental::variant<Ref<Node>, String>> toNodeOrStringVector(ExecState& state)
</span><span class="cx"> {
</span><ins>+ VM& vm = state.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> size_t argumentCount = state.argumentCount();
</span><span class="cx">
</span><span class="cx"> Vector<std::experimental::variant<Ref<Node>, String>> result;
</span><span class="lines">@@ -46,7 +50,7 @@
</span><span class="cx"> result.uncheckedAppend(node->wrapped());
</span><span class="cx"> else {
</span><span class="cx"> String string = value.toWTFString(&state);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return { };
</span><span class="cx"> result.uncheckedAppend(string);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSSQLTransactionCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSSQLTransactionCustom.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSSQLTransactionCustom.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSSQLTransactionCustom.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -44,6 +44,9 @@
</span><span class="cx">
</span><span class="cx"> JSValue JSSQLTransaction::executeSql(ExecState& state)
</span><span class="cx"> {
</span><ins>+ VM& vm = state.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> if (!state.argumentCount()) {
</span><span class="cx"> setDOMException(&state, SYNTAX_ERR);
</span><span class="cx"> return jsUndefined();
</span><span class="lines">@@ -50,7 +53,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String sqlStatement = state.argument(0).toString(&state)->value(&state);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> // Now assemble the list of SQL arguments
</span><span class="lines">@@ -63,15 +66,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue lengthValue = object->get(&state, state.propertyNames().length);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> unsigned length = lengthValue.toUInt32(&state);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> for (unsigned i = 0 ; i < length; ++i) {
</span><span class="cx"> JSValue value = object->get(&state, i);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> if (value.isUndefinedOrNull())
</span><span class="lines">@@ -81,7 +84,7 @@
</span><span class="cx"> else {
</span><span class="cx"> // Convert the argument to a string and append it
</span><span class="cx"> sqlValues.append(value.toString(&state)->value(&state));
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSSVGLengthCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSSVGLengthCustom.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSSVGLengthCustom.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSSVGLengthCustom.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> return throwException(&state, scope, createNotEnoughArgumentsError(&state));
</span><span class="cx">
</span><span class="cx"> unsigned short unitType = state.uncheckedArgument(0).toUInt32(&state);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> ExceptionCode ec = 0;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSStorageCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSStorageCustom.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSStorageCustom.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSStorageCustom.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -79,16 +79,19 @@
</span><span class="cx">
</span><span class="cx"> void JSStorage::getOwnPropertyNames(JSObject* object, ExecState* exec, PropertyNameArray& propertyNames, EnumerationMode mode)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> JSStorage* thisObject = jsCast<JSStorage*>(object);
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> unsigned length = thisObject->wrapped().length(ec);
</span><span class="cx"> setDOMException(exec, ec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> for (unsigned i = 0; i < length; ++i) {
</span><span class="cx"> propertyNames.add(Identifier::fromString(exec, thisObject->wrapped().key(i, ec)));
</span><span class="cx"> setDOMException(exec, ec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -97,6 +100,9 @@
</span><span class="cx">
</span><span class="cx"> bool JSStorage::putDelegate(ExecState* exec, PropertyName propertyName, JSValue value, PutPropertySlot&, bool& putResult)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> // Only perform the custom put if the object doesn't have a native property by this name.
</span><span class="cx"> // Since hasProperty() would end up calling canGetItemsForName() and be fooled, we need to check
</span><span class="cx"> // the native property slots manually.
</span><span class="lines">@@ -110,7 +116,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> String stringValue = value.toString(exec)->value(exec);
</span><del>- if (exec->hadException()) {
</del><ins>+ if (UNLIKELY(scope.exception())) {
</ins><span class="cx"> // The return value indicates whether putDelegate() should handle the put operation (which
</span><span class="cx"> // if true, tells the caller not to execute the generic put). It does not indicate whether
</span><span class="cx"> // putDelegate() did successfully complete the operation or not (which it didn't in this
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSTextTrackCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSTextTrackCustom.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSTextTrackCustom.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSTextTrackCustom.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -44,8 +44,11 @@
</span><span class="cx"> void JSTextTrack::setLanguage(ExecState& state, JSValue value)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><ins>+ VM& vm = state.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> auto& string = value.toString(&state)->value(&state);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> wrapped().setLanguage(string);
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSVideoTrackCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSVideoTrackCustom.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSVideoTrackCustom.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSVideoTrackCustom.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -43,8 +43,11 @@
</span><span class="cx"> void JSVideoTrack::setKind(ExecState& state, JSValue value)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><ins>+ VM& vm = state.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> auto& string = value.toString(&state)->value(&state);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> wrapped().setKind(string);
</span><span class="cx"> #else
</span><span class="lines">@@ -56,8 +59,11 @@
</span><span class="cx"> void JSVideoTrack::setLanguage(ExecState& state, JSValue value)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><ins>+ VM& vm = state.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> auto& string = value.toString(&state)->value(&state);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> wrapped().setLanguage(string);
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSWebGL2RenderingContextCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSWebGL2RenderingContextCustom.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSWebGL2RenderingContextCustom.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSWebGL2RenderingContextCustom.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -106,10 +106,10 @@
</span><span class="cx">
</span><span class="cx"> WebGL2RenderingContext& context = wrapped();
</span><span class="cx"> unsigned pname = exec.uncheckedArgument(0).toInt32(&exec);
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> unsigned index = exec.uncheckedArgument(1).toInt32(&exec);
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> WebGLGetInfo info = context.getIndexedParameter(pname, index);
</span><span class="cx"> return toJS(&exec, globalObject(), info);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSWebGLRenderingContextBaseCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextBaseCustom.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextBaseCustom.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextBaseCustom.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -199,10 +199,10 @@
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> WebGLRenderingContextBase& context = obj->wrapped();
</span><span class="cx"> unsigned target = state.uncheckedArgument(0).toInt32(&state);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> unsigned pname = state.uncheckedArgument(1).toInt32(&state);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> WebGLGetInfo info;
</span><span class="cx"> switch (objectType) {
</span><span class="lines">@@ -335,7 +335,7 @@
</span><span class="cx">
</span><span class="cx"> WebGLRenderingContextBase& context = wrapped();
</span><span class="cx"> const String name = state.uncheckedArgument(0).toString(&state)->value(&state);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> WebGLExtension* extension = context.getExtension(name);
</span><span class="cx"> return toJS(&state, globalObject(), extension);
</span><span class="lines">@@ -357,13 +357,13 @@
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> WebGLRenderingContextBase& context = wrapped();
</span><span class="cx"> unsigned target = state.uncheckedArgument(0).toInt32(&state);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> unsigned attachment = state.uncheckedArgument(1).toInt32(&state);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> unsigned pname = state.uncheckedArgument(2).toInt32(&state);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> WebGLGetInfo info = context.getFramebufferAttachmentParameter(target, attachment, pname, ec);
</span><span class="cx"> if (ec) {
</span><span class="lines">@@ -384,7 +384,7 @@
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> WebGLRenderingContextBase& context = wrapped();
</span><span class="cx"> unsigned pname = state.uncheckedArgument(0).toInt32(&state);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> WebGLGetInfo info = context.getParameter(pname, ec);
</span><span class="cx"> if (ec) {
</span><span class="lines">@@ -408,7 +408,7 @@
</span><span class="cx"> if (!program && !state.uncheckedArgument(0).isUndefinedOrNull())
</span><span class="cx"> return throwTypeError(&state, scope);
</span><span class="cx"> unsigned pname = state.uncheckedArgument(1).toInt32(&state);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> WebGLGetInfo info = context.getProgramParameter(program, pname, ec);
</span><span class="cx"> if (ec) {
</span><span class="lines">@@ -437,7 +437,7 @@
</span><span class="cx"> return throwTypeError(&state, scope);
</span><span class="cx"> WebGLShader* shader = JSWebGLShader::toWrapped(state.uncheckedArgument(0));
</span><span class="cx"> unsigned pname = state.uncheckedArgument(1).toInt32(&state);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> WebGLGetInfo info = context.getShaderParameter(shader, pname, ec);
</span><span class="cx"> if (ec) {
</span><span class="lines">@@ -496,6 +496,9 @@
</span><span class="cx"> template<typename T, size_t inlineCapacity>
</span><span class="cx"> bool toVector(JSC::ExecState& state, JSC::JSValue value, Vector<T, inlineCapacity>& vector)
</span><span class="cx"> {
</span><ins>+ VM& vm = state.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> if (!value.isObject())
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -508,7 +511,7 @@
</span><span class="cx">
</span><span class="cx"> for (int32_t i = 0; i < length; ++i) {
</span><span class="cx"> JSC::JSValue v = object->get(&state, i);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> vector[i] = static_cast<T>(v.toNumber(&state));
</span><span class="cx"> }
</span><span class="lines">@@ -556,11 +559,11 @@
</span><span class="cx"> } else
</span><span class="cx"> index = state.uncheckedArgument(0).toInt32(&state);
</span><span class="cx">
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> RefPtr<Float32Array> webGLArray = toFloat32Array(state.uncheckedArgument(1));
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="lines">@@ -707,7 +710,7 @@
</span><span class="cx"> return throwTypeError(&state, scope);
</span><span class="cx">
</span><span class="cx"> bool transpose = state.uncheckedArgument(1).toBoolean(&state);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> RefPtr<Float32Array> webGLArray = toFloat32Array(state.uncheckedArgument(2));
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSWebKitSubtleCryptoCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSWebKitSubtleCryptoCustom.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSWebKitSubtleCryptoCustom.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSWebKitSubtleCryptoCustom.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -63,11 +63,14 @@
</span><span class="cx">
</span><span class="cx"> static RefPtr<CryptoAlgorithm> createAlgorithmFromJSValue(ExecState& state, JSValue value)
</span><span class="cx"> {
</span><ins>+ VM& vm = state.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> CryptoAlgorithmIdentifier algorithmIdentifier;
</span><del>- if (!JSCryptoAlgorithmDictionary::getAlgorithmIdentifier(&state, value, algorithmIdentifier)) {
- ASSERT(state.hadException());
</del><ins>+ auto success = JSCryptoAlgorithmDictionary::getAlgorithmIdentifier(&state, value, algorithmIdentifier);
+ ASSERT_UNUSED(scope, scope.exception() || success);
+ if (!success)
</ins><span class="cx"> return nullptr;
</span><del>- }
</del><span class="cx">
</span><span class="cx"> auto result = CryptoAlgorithmRegistry::singleton().create(algorithmIdentifier);
</span><span class="cx"> if (!result)
</span><span class="lines">@@ -81,7 +84,7 @@
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> String keyFormatString = value.toString(&state)->value(&state);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> if (keyFormatString == "raw")
</span><span class="cx"> result = CryptoKeyFormat::Raw;
</span><span class="lines">@@ -114,7 +117,7 @@
</span><span class="cx"> for (size_t i = 0; i < array->length(); ++i) {
</span><span class="cx"> JSValue element = array->getIndex(&state, i);
</span><span class="cx"> String usageString = element.toString(&state)->value(&state);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> if (usageString == "encrypt")
</span><span class="cx"> result |= CryptoKeyUsageEncrypt;
</span><span class="lines">@@ -145,16 +148,14 @@
</span><span class="cx"> return throwException(&state, scope, createNotEnoughArgumentsError(&state));
</span><span class="cx">
</span><span class="cx"> auto algorithm = createAlgorithmFromJSValue(state, state.uncheckedArgument(0));
</span><del>- if (!algorithm) {
- ASSERT(state.hadException());
</del><ins>+ ASSERT(scope.exception() || algorithm);
+ if (!algorithm)
</ins><span class="cx"> return jsUndefined();
</span><del>- }
</del><span class="cx">
</span><span class="cx"> auto parameters = JSCryptoAlgorithmDictionary::createParametersForEncrypt(&state, algorithm->identifier(), state.uncheckedArgument(0));
</span><del>- if (!parameters) {
- ASSERT(state.hadException());
</del><ins>+ ASSERT(scope.exception() || parameters);
+ if (!parameters)
</ins><span class="cx"> return jsUndefined();
</span><del>- }
</del><span class="cx">
</span><span class="cx"> RefPtr<CryptoKey> key = JSCryptoKey::toWrapped(state.uncheckedArgument(1));
</span><span class="cx"> if (!key)
</span><span class="lines">@@ -167,10 +168,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CryptoOperationData data;
</span><del>- if (!cryptoOperationDataFromJSValue(&state, state.uncheckedArgument(2), data)) {
- ASSERT(state.hadException());
</del><ins>+ auto success = cryptoOperationDataFromJSValue(&state, state.uncheckedArgument(2), data);
+ ASSERT(scope.exception() || success);
+ if (!success)
</ins><span class="cx"> return jsUndefined();
</span><del>- }
</del><span class="cx">
</span><span class="cx">
</span><span class="cx"> JSPromiseDeferred* promiseDeferred = JSPromiseDeferred::create(&state, globalObject());
</span><span class="lines">@@ -201,16 +202,14 @@
</span><span class="cx"> return throwException(&state, scope, createNotEnoughArgumentsError(&state));
</span><span class="cx">
</span><span class="cx"> auto algorithm = createAlgorithmFromJSValue(state, state.uncheckedArgument(0));
</span><del>- if (!algorithm) {
- ASSERT(state.hadException());
</del><ins>+ ASSERT(scope.exception() || algorithm);
+ if (!algorithm)
</ins><span class="cx"> return jsUndefined();
</span><del>- }
</del><span class="cx">
</span><span class="cx"> auto parameters = JSCryptoAlgorithmDictionary::createParametersForDecrypt(&state, algorithm->identifier(), state.uncheckedArgument(0));
</span><del>- if (!parameters) {
- ASSERT(state.hadException());
</del><ins>+ ASSERT(scope.exception() || parameters);
+ if (!parameters)
</ins><span class="cx"> return jsUndefined();
</span><del>- }
</del><span class="cx">
</span><span class="cx"> RefPtr<CryptoKey> key = JSCryptoKey::toWrapped(state.uncheckedArgument(1));
</span><span class="cx"> if (!key)
</span><span class="lines">@@ -223,10 +222,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CryptoOperationData data;
</span><del>- if (!cryptoOperationDataFromJSValue(&state, state.uncheckedArgument(2), data)) {
- ASSERT(state.hadException());
</del><ins>+ auto success = cryptoOperationDataFromJSValue(&state, state.uncheckedArgument(2), data);
+ ASSERT(scope.exception() || success);
+ if (!success)
</ins><span class="cx"> return jsUndefined();
</span><del>- }
</del><span class="cx">
</span><span class="cx"> JSPromiseDeferred* promiseDeferred = JSPromiseDeferred::create(&state, globalObject());
</span><span class="cx"> RefPtr<DeferredWrapper> wrapper = DeferredWrapper::create(&state, globalObject(), promiseDeferred);
</span><span class="lines">@@ -256,16 +255,14 @@
</span><span class="cx"> return throwException(&state, scope, createNotEnoughArgumentsError(&state));
</span><span class="cx">
</span><span class="cx"> auto algorithm = createAlgorithmFromJSValue(state, state.uncheckedArgument(0));
</span><del>- if (!algorithm) {
- ASSERT(state.hadException());
</del><ins>+ ASSERT(scope.exception() || algorithm);
+ if (!algorithm)
</ins><span class="cx"> return jsUndefined();
</span><del>- }
</del><span class="cx">
</span><span class="cx"> auto parameters = JSCryptoAlgorithmDictionary::createParametersForSign(&state, algorithm->identifier(), state.uncheckedArgument(0));
</span><del>- if (!parameters) {
- ASSERT(state.hadException());
</del><ins>+ ASSERT(scope.exception() || parameters);
+ if (!parameters)
</ins><span class="cx"> return jsUndefined();
</span><del>- }
</del><span class="cx">
</span><span class="cx"> RefPtr<CryptoKey> key = JSCryptoKey::toWrapped(state.uncheckedArgument(1));
</span><span class="cx"> if (!key)
</span><span class="lines">@@ -278,10 +275,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CryptoOperationData data;
</span><del>- if (!cryptoOperationDataFromJSValue(&state, state.uncheckedArgument(2), data)) {
- ASSERT(state.hadException());
</del><ins>+ auto success = cryptoOperationDataFromJSValue(&state, state.uncheckedArgument(2), data);
+ ASSERT(scope.exception() || success);
+ if (!success)
</ins><span class="cx"> return jsUndefined();
</span><del>- }
</del><span class="cx">
</span><span class="cx"> JSPromiseDeferred* promiseDeferred = JSPromiseDeferred::create(&state, globalObject());
</span><span class="cx"> RefPtr<DeferredWrapper> wrapper = DeferredWrapper::create(&state, globalObject(), promiseDeferred);
</span><span class="lines">@@ -311,16 +308,14 @@
</span><span class="cx"> return throwException(&state, scope, createNotEnoughArgumentsError(&state));
</span><span class="cx">
</span><span class="cx"> auto algorithm = createAlgorithmFromJSValue(state, state.uncheckedArgument(0));
</span><del>- if (!algorithm) {
- ASSERT(state.hadException());
</del><ins>+ ASSERT(scope.exception() || algorithm);
+ if (!algorithm)
</ins><span class="cx"> return jsUndefined();
</span><del>- }
</del><span class="cx">
</span><span class="cx"> auto parameters = JSCryptoAlgorithmDictionary::createParametersForVerify(&state, algorithm->identifier(), state.uncheckedArgument(0));
</span><del>- if (!parameters) {
- ASSERT(state.hadException());
</del><ins>+ ASSERT(scope.exception() || parameters);
+ if (!parameters)
</ins><span class="cx"> return jsUndefined();
</span><del>- }
</del><span class="cx">
</span><span class="cx"> RefPtr<CryptoKey> key = JSCryptoKey::toWrapped(state.uncheckedArgument(1));
</span><span class="cx"> if (!key)
</span><span class="lines">@@ -333,16 +328,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CryptoOperationData signature;
</span><del>- if (!cryptoOperationDataFromJSValue(&state, state.uncheckedArgument(2), signature)) {
- ASSERT(state.hadException());
</del><ins>+ auto success = cryptoOperationDataFromJSValue(&state, state.uncheckedArgument(2), signature);
+ ASSERT(scope.exception() || success);
+ if (!success)
</ins><span class="cx"> return jsUndefined();
</span><del>- }
</del><span class="cx">
</span><span class="cx"> CryptoOperationData data;
</span><del>- if (!cryptoOperationDataFromJSValue(&state, state.uncheckedArgument(3), data)) {
- ASSERT(state.hadException());
</del><ins>+ success = cryptoOperationDataFromJSValue(&state, state.uncheckedArgument(3), data);
+ ASSERT(scope.exception() || success);
+ if (!success)
</ins><span class="cx"> return jsUndefined();
</span><del>- }
</del><span class="cx">
</span><span class="cx"> JSPromiseDeferred* promiseDeferred = JSPromiseDeferred::create(&state, globalObject());
</span><span class="cx"> RefPtr<DeferredWrapper> wrapper = DeferredWrapper::create(&state, globalObject(), promiseDeferred);
</span><span class="lines">@@ -372,22 +367,20 @@
</span><span class="cx"> return throwException(&state, scope, createNotEnoughArgumentsError(&state));
</span><span class="cx">
</span><span class="cx"> auto algorithm = createAlgorithmFromJSValue(state, state.uncheckedArgument(0));
</span><del>- if (!algorithm) {
- ASSERT(state.hadException());
</del><ins>+ ASSERT(scope.exception() || algorithm);
+ if (!algorithm)
</ins><span class="cx"> return jsUndefined();
</span><del>- }
</del><span class="cx">
</span><span class="cx"> auto parameters = JSCryptoAlgorithmDictionary::createParametersForDigest(&state, algorithm->identifier(), state.uncheckedArgument(0));
</span><del>- if (!parameters) {
- ASSERT(state.hadException());
</del><ins>+ ASSERT(scope.exception() || parameters);
+ if (!parameters)
</ins><span class="cx"> return jsUndefined();
</span><del>- }
</del><span class="cx">
</span><span class="cx"> CryptoOperationData data;
</span><del>- if (!cryptoOperationDataFromJSValue(&state, state.uncheckedArgument(1), data)) {
- ASSERT(state.hadException());
</del><ins>+ auto success = cryptoOperationDataFromJSValue(&state, state.uncheckedArgument(1), data);
+ ASSERT(scope.exception() || success);
+ if (!success)
</ins><span class="cx"> return jsUndefined();
</span><del>- }
</del><span class="cx">
</span><span class="cx"> JSPromiseDeferred* promiseDeferred = JSPromiseDeferred::create(&state, globalObject());
</span><span class="cx"> RefPtr<DeferredWrapper> wrapper = DeferredWrapper::create(&state, globalObject(), promiseDeferred);
</span><span class="lines">@@ -417,30 +410,28 @@
</span><span class="cx"> return throwException(&state, scope, createNotEnoughArgumentsError(&state));
</span><span class="cx">
</span><span class="cx"> auto algorithm = createAlgorithmFromJSValue(state, state.uncheckedArgument(0));
</span><del>- if (!algorithm) {
- ASSERT(state.hadException());
</del><ins>+ ASSERT(scope.exception() || algorithm);
+ if (!algorithm)
</ins><span class="cx"> return jsUndefined();
</span><del>- }
</del><span class="cx">
</span><span class="cx"> auto parameters = JSCryptoAlgorithmDictionary::createParametersForGenerateKey(&state, algorithm->identifier(), state.uncheckedArgument(0));
</span><del>- if (!parameters) {
- ASSERT(state.hadException());
</del><ins>+ ASSERT(scope.exception() || parameters);
+ if (!parameters)
</ins><span class="cx"> return jsUndefined();
</span><del>- }
</del><span class="cx">
</span><span class="cx"> bool extractable = false;
</span><span class="cx"> if (state.argumentCount() >= 2) {
</span><span class="cx"> extractable = state.uncheckedArgument(1).toBoolean(&state);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CryptoKeyUsage keyUsages = 0;
</span><span class="cx"> if (state.argumentCount() >= 3) {
</span><del>- if (!cryptoKeyUsagesFromJSValue(state, state.argument(2), keyUsages)) {
- ASSERT(state.hadException());
</del><ins>+ auto success = cryptoKeyUsagesFromJSValue(state, state.argument(2), keyUsages);
+ ASSERT(scope.exception() || success);
+ if (!success)
</ins><span class="cx"> return jsUndefined();
</span><del>- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSPromiseDeferred* promiseDeferred = JSPromiseDeferred::create(&state, globalObject());
</span><span class="lines">@@ -484,7 +475,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> keySerialization = std::make_unique<JSCryptoKeySerializationJWK>(&state, jwkString);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -497,11 +488,11 @@
</span><span class="cx">
</span><span class="cx"> Optional<CryptoAlgorithmPair> reconciledResult = keySerialization->reconcileAlgorithm(algorithm.get(), parameters.get());
</span><span class="cx"> if (!reconciledResult) {
</span><del>- if (!state.hadException())
</del><ins>+ if (!scope.exception())
</ins><span class="cx"> throwTypeError(&state, scope, ASCIILiteral("Algorithm specified in key is not compatible with one passed to importKey as argument"));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> algorithm = reconciledResult->algorithm;
</span><span class="lines">@@ -513,15 +504,15 @@
</span><span class="cx"> ASSERT(parameters);
</span><span class="cx">
</span><span class="cx"> keySerialization->reconcileExtractable(extractable);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> keySerialization->reconcileUsages(keyUsages);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> auto keyData = keySerialization->keyData();
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="lines">@@ -539,45 +530,44 @@
</span><span class="cx"> return throwException(&state, scope, createNotEnoughArgumentsError(&state));
</span><span class="cx">
</span><span class="cx"> CryptoKeyFormat keyFormat;
</span><del>- if (!cryptoKeyFormatFromJSValue(state, state.argument(0), keyFormat)) {
- ASSERT(state.hadException());
</del><ins>+ auto success = cryptoKeyFormatFromJSValue(state, state.argument(0), keyFormat);
+ ASSERT(scope.exception() || success);
+ if (!success)
</ins><span class="cx"> return jsUndefined();
</span><del>- }
</del><span class="cx">
</span><span class="cx"> CryptoOperationData data;
</span><del>- if (!cryptoOperationDataFromJSValue(&state, state.uncheckedArgument(1), data)) {
- ASSERT(state.hadException());
</del><ins>+ success = cryptoOperationDataFromJSValue(&state, state.uncheckedArgument(1), data);
+ ASSERT(scope.exception() || success);
+ if (!success)
</ins><span class="cx"> return jsUndefined();
</span><del>- }
</del><span class="cx">
</span><span class="cx"> RefPtr<CryptoAlgorithm> algorithm;
</span><span class="cx"> RefPtr<CryptoAlgorithmParameters> parameters;
</span><span class="cx"> if (!state.uncheckedArgument(2).isNull()) {
</span><span class="cx"> algorithm = createAlgorithmFromJSValue(state, state.uncheckedArgument(2));
</span><del>- if (!algorithm) {
- ASSERT(state.hadException());
</del><ins>+ ASSERT(scope.exception() || algorithm);
+ if (!algorithm)
</ins><span class="cx"> return jsUndefined();
</span><del>- }
</del><ins>+
</ins><span class="cx"> parameters = JSCryptoAlgorithmDictionary::createParametersForImportKey(&state, algorithm->identifier(), state.uncheckedArgument(2));
</span><del>- if (!parameters) {
- ASSERT(state.hadException());
</del><ins>+ ASSERT(scope.exception() || parameters);
+ if (!parameters)
</ins><span class="cx"> return jsUndefined();
</span><del>- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool extractable = false;
</span><span class="cx"> if (state.argumentCount() >= 4) {
</span><span class="cx"> extractable = state.uncheckedArgument(3).toBoolean(&state);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CryptoKeyUsage keyUsages = 0;
</span><span class="cx"> if (state.argumentCount() >= 5) {
</span><del>- if (!cryptoKeyUsagesFromJSValue(state, state.argument(4), keyUsages)) {
- ASSERT(state.hadException());
</del><ins>+ auto success = cryptoKeyUsagesFromJSValue(state, state.argument(4), keyUsages);
+ ASSERT(scope.exception() || success);
+ if (!success)
</ins><span class="cx"> return jsUndefined();
</span><del>- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSPromiseDeferred* promiseDeferred = JSPromiseDeferred::create(&state, globalObject());
</span><span class="lines">@@ -590,7 +580,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebCore::importKey(state, keyFormat, data, WTFMove(algorithm), WTFMove(parameters), extractable, keyUsages, WTFMove(successCallback), WTFMove(failureCallback));
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> return promiseDeferred->promise();
</span><span class="lines">@@ -617,7 +607,7 @@
</span><span class="cx"> }
</span><span class="cx"> case CryptoKeyFormat::JWK: {
</span><span class="cx"> String result = JSCryptoKeySerializationJWK::serialize(&state, key);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx"> CString utf8String = result.utf8(StrictConversion);
</span><span class="cx"> Vector<uint8_t> resultBuffer;
</span><span class="lines">@@ -640,10 +630,10 @@
</span><span class="cx"> return throwException(&state, scope, createNotEnoughArgumentsError(&state));
</span><span class="cx">
</span><span class="cx"> CryptoKeyFormat keyFormat;
</span><del>- if (!cryptoKeyFormatFromJSValue(state, state.argument(0), keyFormat)) {
- ASSERT(state.hadException());
</del><ins>+ auto success = cryptoKeyFormatFromJSValue(state, state.argument(0), keyFormat);
+ ASSERT(scope.exception() || success);
+ if (!success)
</ins><span class="cx"> return jsUndefined();
</span><del>- }
</del><span class="cx">
</span><span class="cx"> RefPtr<CryptoKey> key = JSCryptoKey::toWrapped(state.uncheckedArgument(1));
</span><span class="cx"> if (!key)
</span><span class="lines">@@ -659,7 +649,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebCore::exportKey(state, keyFormat, *key, WTFMove(successCallback), WTFMove(failureCallback));
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="cx"> return promiseDeferred->promise();
</span><span class="lines">@@ -674,10 +664,10 @@
</span><span class="cx"> return throwException(&state, scope, createNotEnoughArgumentsError(&state));
</span><span class="cx">
</span><span class="cx"> CryptoKeyFormat keyFormat;
</span><del>- if (!cryptoKeyFormatFromJSValue(state, state.argument(0), keyFormat)) {
- ASSERT(state.hadException());
</del><ins>+ auto success = cryptoKeyFormatFromJSValue(state, state.argument(0), keyFormat);
+ ASSERT(scope.exception() || success);
+ if (!success)
</ins><span class="cx"> return jsUndefined();
</span><del>- }
</del><span class="cx">
</span><span class="cx"> RefPtr<CryptoKey> key = JSCryptoKey::toWrapped(state.uncheckedArgument(1));
</span><span class="cx"> if (!key)
</span><span class="lines">@@ -694,16 +684,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> auto algorithm = createAlgorithmFromJSValue(state, state.uncheckedArgument(3));
</span><del>- if (!algorithm) {
- ASSERT(state.hadException());
</del><ins>+ ASSERT(scope.exception() || algorithm);
+ if (!algorithm)
</ins><span class="cx"> return jsUndefined();
</span><del>- }
</del><span class="cx">
</span><span class="cx"> auto parameters = JSCryptoAlgorithmDictionary::createParametersForEncrypt(&state, algorithm->identifier(), state.uncheckedArgument(3));
</span><del>- if (!parameters) {
- ASSERT(state.hadException());
</del><ins>+ ASSERT(scope.exception() || parameters);
+ if (!parameters)
</ins><span class="cx"> return jsUndefined();
</span><del>- }
</del><span class="cx">
</span><span class="cx"> JSPromiseDeferred* promiseDeferred = JSPromiseDeferred::create(&state, globalObject());
</span><span class="cx"> RefPtr<DeferredWrapper> wrapper = DeferredWrapper::create(&state, globalObject(), promiseDeferred);
</span><span class="lines">@@ -746,16 +734,16 @@
</span><span class="cx"> return throwException(&state, scope, createNotEnoughArgumentsError(&state));
</span><span class="cx">
</span><span class="cx"> CryptoKeyFormat keyFormat;
</span><del>- if (!cryptoKeyFormatFromJSValue(state, state.argument(0), keyFormat)) {
- ASSERT(state.hadException());
</del><ins>+ auto success = cryptoKeyFormatFromJSValue(state, state.argument(0), keyFormat);
+ ASSERT(scope.exception() || success);
+ if (!success)
</ins><span class="cx"> return jsUndefined();
</span><del>- }
</del><span class="cx">
</span><span class="cx"> CryptoOperationData wrappedKeyData;
</span><del>- if (!cryptoOperationDataFromJSValue(&state, state.uncheckedArgument(1), wrappedKeyData)) {
- ASSERT(state.hadException());
</del><ins>+ success = cryptoOperationDataFromJSValue(&state, state.uncheckedArgument(1), wrappedKeyData);
+ ASSERT(scope.exception() || success);
+ if (!success)
</ins><span class="cx"> return jsUndefined();
</span><del>- }
</del><span class="cx">
</span><span class="cx"> RefPtr<CryptoKey> unwrappingKey = JSCryptoKey::toWrapped(state.uncheckedArgument(2));
</span><span class="cx"> if (!unwrappingKey)
</span><span class="lines">@@ -768,44 +756,41 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> auto unwrapAlgorithm = createAlgorithmFromJSValue(state, state.uncheckedArgument(3));
</span><del>- if (!unwrapAlgorithm) {
- ASSERT(state.hadException());
</del><ins>+ ASSERT(scope.exception() || unwrapAlgorithm);
+ if (!unwrapAlgorithm)
</ins><span class="cx"> return jsUndefined();
</span><del>- }
</del><span class="cx"> auto unwrapAlgorithmParameters = JSCryptoAlgorithmDictionary::createParametersForDecrypt(&state, unwrapAlgorithm->identifier(), state.uncheckedArgument(3));
</span><del>- if (!unwrapAlgorithmParameters) {
- ASSERT(state.hadException());
</del><ins>+ ASSERT(scope.exception() || unwrapAlgorithmParameters);
+ if (!unwrapAlgorithmParameters)
</ins><span class="cx"> return jsUndefined();
</span><del>- }
</del><span class="cx">
</span><span class="cx"> RefPtr<CryptoAlgorithm> unwrappedKeyAlgorithm;
</span><span class="cx"> RefPtr<CryptoAlgorithmParameters> unwrappedKeyAlgorithmParameters;
</span><span class="cx"> if (!state.uncheckedArgument(4).isNull()) {
</span><span class="cx"> unwrappedKeyAlgorithm = createAlgorithmFromJSValue(state, state.uncheckedArgument(4));
</span><del>- if (!unwrappedKeyAlgorithm) {
- ASSERT(state.hadException());
</del><ins>+ ASSERT(scope.exception() || unwrappedKeyAlgorithm);
+ if (!unwrappedKeyAlgorithm)
</ins><span class="cx"> return jsUndefined();
</span><del>- }
</del><ins>+
</ins><span class="cx"> unwrappedKeyAlgorithmParameters = JSCryptoAlgorithmDictionary::createParametersForImportKey(&state, unwrappedKeyAlgorithm->identifier(), state.uncheckedArgument(4));
</span><del>- if (!unwrappedKeyAlgorithmParameters) {
- ASSERT(state.hadException());
</del><ins>+ ASSERT(scope.exception() || unwrappedKeyAlgorithmParameters);
+ if (!unwrappedKeyAlgorithmParameters)
</ins><span class="cx"> return jsUndefined();
</span><del>- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool extractable = false;
</span><span class="cx"> if (state.argumentCount() >= 6) {
</span><span class="cx"> extractable = state.uncheckedArgument(5).toBoolean(&state);
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CryptoKeyUsage keyUsages = 0;
</span><span class="cx"> if (state.argumentCount() >= 7) {
</span><del>- if (!cryptoKeyUsagesFromJSValue(state, state.argument(6), keyUsages)) {
- ASSERT(state.hadException());
</del><ins>+ auto success = cryptoKeyUsagesFromJSValue(state, state.argument(6), keyUsages);
+ ASSERT(scope.exception() || success);
+ if (!success)
</ins><span class="cx"> return jsUndefined();
</span><del>- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSPromiseDeferred* promiseDeferred = JSPromiseDeferred::create(&state, globalObject());
</span><span class="lines">@@ -819,11 +804,15 @@
</span><span class="cx"> auto importFailureCallback = [wrapper]() mutable {
</span><span class="cx"> wrapper->reject(nullptr);
</span><span class="cx"> };
</span><ins>+
+ VM& vm = domGlobalObject->vm();
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
</ins><span class="cx"> ExecState& state = *domGlobalObject->globalExec();
</span><span class="cx"> WebCore::importKey(state, keyFormat, std::make_pair(result.data(), result.size()), unwrappedKeyAlgorithm, unwrappedKeyAlgorithmParameters, extractable, keyUsages, WTFMove(importSuccessCallback), WTFMove(importFailureCallback));
</span><del>- if (state.hadException()) {
</del><ins>+ if (UNLIKELY(scope.exception())) {
</ins><span class="cx"> // FIXME: Report exception details to console, and possibly to calling script once there is a standardized way to pass errors to WebCrypto promise reject functions.
</span><del>- state.clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> wrapper->reject(nullptr);
</span><span class="cx"> }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSWorkerCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSWorkerCustom.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSWorkerCustom.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSWorkerCustom.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> return throwVMError(&exec, scope, createNotEnoughArgumentsError(&exec));
</span><span class="cx">
</span><span class="cx"> String scriptURL = exec.uncheckedArgument(0).toWTFString(&exec);
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx">
</span><span class="cx"> // See section 4.8.2 step 14 of WebWorkers for why this is the lexicalGlobalObject.
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSWorkerGlobalScopeCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeCustom.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeCustom.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeCustom.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -61,6 +61,9 @@
</span><span class="cx">
</span><span class="cx"> JSValue JSWorkerGlobalScope::importScripts(ExecState& state)
</span><span class="cx"> {
</span><ins>+ VM& vm = state.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> if (!state.argumentCount())
</span><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="lines">@@ -67,7 +70,7 @@
</span><span class="cx"> Vector<String> urls;
</span><span class="cx"> for (unsigned i = 0; i < state.argumentCount(); ++i) {
</span><span class="cx"> urls.append(valueToUSVString(&state, state.uncheckedArgument(i)));
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="lines">@@ -86,7 +89,7 @@
</span><span class="cx"> return throwException(&state, scope, createNotEnoughArgumentsError(&state));
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<ScheduledAction> action = ScheduledAction::create(&state, globalObject()->world(), wrapped().contentSecurityPolicy());
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> if (!action)
</span><span class="cx"> return jsNumber(0);
</span><span class="lines">@@ -103,7 +106,7 @@
</span><span class="cx"> return throwException(&state, scope, createNotEnoughArgumentsError(&state));
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<ScheduledAction> action = ScheduledAction::create(&state, globalObject()->world(), wrapped().contentSecurityPolicy());
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return jsUndefined();
</span><span class="cx"> if (!action)
</span><span class="cx"> return jsNumber(0);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsReadableStreamDefaultControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ReadableStreamDefaultController.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ReadableStreamDefaultController.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/ReadableStreamDefaultController.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> auto function = object.get(&state, JSC::Identifier::fromString(&state, propertyName));
</span><del>- if (state.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSC::jsUndefined();
</span><span class="cx">
</span><span class="cx"> if (!function.isFunction()) {
</span><span class="lines">@@ -70,19 +70,22 @@
</span><span class="cx">
</span><span class="cx"> bool ReadableStreamDefaultController::isControlledReadableStreamLocked() const
</span><span class="cx"> {
</span><del>- auto& state = *globalObject()->globalExec();
- JSC::JSLockHolder lock(&state);
</del><ins>+ auto globalObject = this->globalObject();
+ JSC::VM& vm = globalObject->vm();
+ JSC::JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+ auto& state = *globalObject->globalExec();
</ins><span class="cx">
</span><del>- auto& clientData = *static_cast<JSVMClientData*>(state.vm().clientData);
</del><ins>+ auto& clientData = *static_cast<JSVMClientData*>(vm.clientData);
</ins><span class="cx"> auto readableStream = m_jsController->get(&state, clientData.builtinNames().controlledReadableStreamPrivateName());
</span><del>- ASSERT(!state.hadException());
</del><ins>+ ASSERT_UNUSED(scope, !scope.exception());
</ins><span class="cx">
</span><del>- auto isLocked = globalObject()->builtinInternalFunctions().readableStreamInternals().m_isReadableStreamLockedFunction.get();
</del><ins>+ auto isLocked = globalObject->builtinInternalFunctions().readableStreamInternals().m_isReadableStreamLockedFunction.get();
</ins><span class="cx">
</span><span class="cx"> JSC::MarkedArgumentBuffer arguments;
</span><span class="cx"> arguments.append(readableStream);
</span><span class="cx"> auto result = callFunction(state, isLocked, JSC::jsUndefined(), arguments);
</span><del>- ASSERT(!state.hadException());
</del><ins>+ ASSERT(!scope.exception());
</ins><span class="cx">
</span><span class="cx"> return result.isTrue();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsReadableStreamDefaultControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ReadableStreamDefaultController.h (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ReadableStreamDefaultController.h 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/ReadableStreamDefaultController.h 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -74,8 +74,11 @@
</span><span class="cx">
</span><span class="cx"> inline bool ReadableStreamDefaultController::enqueue(RefPtr<JSC::ArrayBuffer>&& buffer)
</span><span class="cx"> {
</span><del>- JSC::ExecState& state = *globalObject()->globalExec();
- JSC::JSLockHolder locker(&state);
</del><ins>+ auto globalObject = this->globalObject();
+ JSC::VM& vm = globalObject->vm();
+ JSC::JSLockHolder locker(vm);
+ auto scope = DECLARE_THROW_SCOPE(vm);
+ JSC::ExecState& state = *globalObject->globalExec();
</ins><span class="cx">
</span><span class="cx"> if (!buffer) {
</span><span class="cx"> error(state, createOutOfMemoryError(&state));
</span><span class="lines">@@ -84,8 +87,8 @@
</span><span class="cx"> auto length = buffer->byteLength();
</span><span class="cx"> auto chunk = JSC::Uint8Array::create(WTFMove(buffer), 0, length);
</span><span class="cx"> ASSERT(chunk);
</span><del>- enqueue(state, toJS(&state, globalObject(), chunk.get()));
- ASSERT(!state.hadException());
</del><ins>+ enqueue(state, toJS(&state, globalObject, chunk.get()));
+ ASSERT_UNUSED(scope, !scope.exception());
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScheduledActioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ScheduledAction.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScheduledAction.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/ScheduledAction.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -48,6 +48,9 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<ScheduledAction> ScheduledAction::create(ExecState* exec, DOMWrapperWorld& isolatedWorld, ContentSecurityPolicy* policy)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> JSValue v = exec->argument(0);
</span><span class="cx"> CallData callData;
</span><span class="cx"> if (getCallData(v, callData) == CallType::None) {
</span><span class="lines">@@ -54,7 +57,7 @@
</span><span class="cx"> if (policy && !policy->allowEval(exec))
</span><span class="cx"> return nullptr;
</span><span class="cx"> String string = v.toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> return std::unique_ptr<ScheduledAction>(new ScheduledAction(string, isolatedWorld));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptGlobalObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ScriptGlobalObject.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptGlobalObject.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/ScriptGlobalObject.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -43,10 +43,11 @@
</span><span class="cx"> {
</span><span class="cx"> auto& vm = scriptState.vm();
</span><span class="cx"> JSLockHolder lock(vm);
</span><ins>+ auto scope = DECLARE_CATCH_SCOPE(vm);
</ins><span class="cx"> auto& globalObject = *jsCast<JSDOMGlobalObject*>(scriptState.lexicalGlobalObject());
</span><span class="cx"> globalObject.putDirect(vm, Identifier::fromString(&vm, name), toJS(&scriptState, &globalObject, value));
</span><del>- if (scriptState.hadException()) {
- reportException(&scriptState, scriptState.exception());
</del><ins>+ if (UNLIKELY(scope.exception())) {
+ reportException(&scriptState, scope.exception());
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsSerializedScriptValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -389,7 +389,9 @@
</span><span class="cx">
</span><span class="cx"> bool shouldTerminate()
</span><span class="cx"> {
</span><del>- return m_exec->hadException();
</del><ins>+ VM& vm = m_exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+ return scope.exception();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void throwStackOverflow()
</span><span class="lines">@@ -2448,6 +2450,9 @@
</span><span class="cx">
</span><span class="cx"> DeserializationResult CloneDeserializer::deserialize()
</span><span class="cx"> {
</span><ins>+ VM& vm = m_exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> Vector<uint32_t, 16> indexStack;
</span><span class="cx"> Vector<Identifier, 16> propertyNameStack;
</span><span class="cx"> Vector<JSObject*, 32> outputObjectStack;
</span><span class="lines">@@ -2468,7 +2473,7 @@
</span><span class="cx"> goto error;
</span><span class="cx"> }
</span><span class="cx"> JSArray* outArray = constructEmptyArray(m_exec, 0, m_globalObject, length);
</span><del>- if (UNLIKELY(m_exec->hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> goto error;
</span><span class="cx"> m_gcBuffer.append(outArray);
</span><span class="cx"> outputObjectStack.append(outArray);
</span><span class="lines">@@ -2546,7 +2551,7 @@
</span><span class="cx"> if (outputObjectStack.size() > maximumFilterRecursion)
</span><span class="cx"> return std::make_pair(JSValue(), StackOverflowError);
</span><span class="cx"> JSMap* map = JSMap::create(m_exec, m_exec->vm(), m_globalObject->mapStructure());
</span><del>- if (UNLIKELY(m_exec->hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> goto error;
</span><span class="cx"> m_gcBuffer.append(map);
</span><span class="cx"> outputObjectStack.append(map);
</span><span class="lines">@@ -2577,7 +2582,7 @@
</span><span class="cx"> if (outputObjectStack.size() > maximumFilterRecursion)
</span><span class="cx"> return std::make_pair(JSValue(), StackOverflowError);
</span><span class="cx"> JSSet* set = JSSet::create(m_exec, m_exec->vm(), m_globalObject->setStructure());
</span><del>- if (UNLIKELY(m_exec->hadException()))
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> goto error;
</span><span class="cx"> m_gcBuffer.append(set);
</span><span class="cx"> outputObjectStack.append(set);
</span><span class="lines">@@ -2710,13 +2715,16 @@
</span><span class="cx"> RefPtr<SerializedScriptValue> SerializedScriptValue::create(JSContextRef originContext, JSValueRef apiValue, JSValueRef* exception)
</span><span class="cx"> {
</span><span class="cx"> ExecState* exec = toJS(originContext);
</span><del>- JSLockHolder locker(exec);
</del><ins>+ VM& vm = exec->vm();
+ JSLockHolder locker(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
</ins><span class="cx"> JSValue value = toJS(exec, apiValue);
</span><span class="cx"> RefPtr<SerializedScriptValue> serializedValue = SerializedScriptValue::create(exec, value, nullptr, nullptr);
</span><del>- if (exec->hadException()) {
</del><ins>+ if (UNLIKELY(scope.exception())) {
</ins><span class="cx"> if (exception)
</span><del>- *exception = toRef(exec, exec->exception()->value());
- exec->clearException();
</del><ins>+ *exception = toRef(exec, scope.exception()->value());
+ scope.clearException();
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx"> ASSERT(serializedValue);
</span><span class="lines">@@ -2745,12 +2753,15 @@
</span><span class="cx"> JSValueRef SerializedScriptValue::deserialize(JSContextRef destinationContext, JSValueRef* exception)
</span><span class="cx"> {
</span><span class="cx"> ExecState* exec = toJS(destinationContext);
</span><del>- JSLockHolder locker(exec);
</del><ins>+ VM& vm = exec->vm();
+ JSLockHolder locker(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
</ins><span class="cx"> JSValue value = deserialize(exec, exec->lexicalGlobalObject(), nullptr);
</span><del>- if (exec->hadException()) {
</del><ins>+ if (UNLIKELY(scope.exception())) {
</ins><span class="cx"> if (exception)
</span><del>- *exception = toRef(exec, exec->exception()->value());
- exec->clearException();
</del><ins>+ *exception = toRef(exec, scope.exception()->value());
+ scope.clearException();
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx"> ASSERT(value);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsWorkerScriptControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/WorkerScriptController.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/WorkerScriptController.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/js/WorkerScriptController.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -127,7 +127,6 @@
</span><span class="cx"> ExecState* exec = m_workerGlobalScopeWrapper->globalExec();
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="cx"> JSLockHolder lock(vm);
</span><del>- auto scope = DECLARE_THROW_SCOPE(vm);
</del><span class="cx">
</span><span class="cx"> JSC::evaluate(exec, sourceCode.jsSourceCode(), m_workerGlobalScopeWrapper->globalThis(), returnedException);
</span><span class="cx">
</span><span class="lines">@@ -142,11 +141,8 @@
</span><span class="cx"> int columnNumber = 0;
</span><span class="cx"> String sourceURL = sourceCode.url().string();
</span><span class="cx"> Deprecated::ScriptValue error;
</span><del>- if (m_workerGlobalScope->sanitizeScriptError(errorMessage, lineNumber, columnNumber, sourceURL, error, sourceCode.cachedScript())) {
- throwException(exec, scope, createError(exec, errorMessage.impl()));
- returnedException = vm.exception();
- vm.clearException();
- }
</del><ins>+ if (m_workerGlobalScope->sanitizeScriptError(errorMessage, lineNumber, columnNumber, sourceURL, error, sourceCode.cachedScript()))
+ returnedException = Exception::create(vm, createError(exec, errorMessage.impl()));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -1024,7 +1024,7 @@
</span><span class="cx"> my $needExceptionCheck = 0;
</span><span class="cx"> foreach my $member (@{$dictionary->members}) {
</span><span class="cx"> if ($needExceptionCheck) {
</span><del>- $result .= " if (UNLIKELY(state.hadException()))\n";
</del><ins>+ $result .= " if (UNLIKELY(throwScope.exception()))\n";
</ins><span class="cx"> $result .= " return Nullopt;\n";
</span><span class="cx"> }
</span><span class="cx"> # FIXME: Eventually we will want this to share a lot more code with JSValueToNative.
</span><span class="lines">@@ -3133,7 +3133,7 @@
</span><span class="cx"> push(@implContent, "{\n");
</span><span class="cx"> push(@implContent, " VM& vm = state->vm();\n");
</span><span class="cx"> push(@implContent, " auto throwScope = DECLARE_THROW_SCOPE(vm);\n");
</span><del>- push(@implContent, " UNUSED_PARAM(throwScope);");
</del><ins>+ push(@implContent, " UNUSED_PARAM(throwScope);\n");
</ins><span class="cx"> push(@implContent, " JSValue value = JSValue::decode(encodedValue);\n");
</span><span class="cx"> push(@implContent, " UNUSED_PARAM(thisValue);\n") if !$attribute->isStatic;
</span><span class="cx"> if (!$attribute->isStatic) {
</span><span class="lines">@@ -3231,7 +3231,7 @@
</span><span class="cx"> push(@implContent, " if (!value.isUndefinedOrNull()) {\n");
</span><span class="cx"> push(@implContent, " nativeValue = $nativeValue;\n");
</span><span class="cx"> if ($mayThrowException) {
</span><del>- push(@implContent, " if (UNLIKELY(state->hadException()))\n");
</del><ins>+ push(@implContent, " if (UNLIKELY(throwScope.exception()))\n");
</ins><span class="cx"> push(@implContent, " return false;\n");
</span><span class="cx"> }
</span><span class="cx"> push(@implContent, " if (UNLIKELY(!nativeValue)) {\n");
</span><span class="lines">@@ -3242,7 +3242,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> push(@implContent, " auto nativeValue = $nativeValue;\n");
</span><span class="cx"> if ($mayThrowException) {
</span><del>- push(@implContent, " if (UNLIKELY(state->hadException()))\n");
</del><ins>+ push(@implContent, " if (UNLIKELY(throwScope.exception()))\n");
</ins><span class="cx"> push(@implContent, " return false;\n");
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -3979,7 +3979,7 @@
</span><span class="cx"> push(@$outputArray, " auto $name = toArguments<VariadicHelper<$wrapperType, $wrappedType>>(*state, $argumentIndex);\n");
</span><span class="cx">
</span><span class="cx"> if (IsNativeType($type)) {
</span><del>- push(@$outputArray, " if (UNLIKELY(state->hadException()))\n");
</del><ins>+ push(@$outputArray, " if (UNLIKELY(throwScope.exception()))\n");
</ins><span class="cx"> push(@$outputArray, " return JSValue::encode(jsUndefined());\n");
</span><span class="cx"> }
</span><span class="cx"> else {
</span><span class="lines">@@ -4019,7 +4019,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> push(@$outputArray, "$indent $defineOptionalValue = parse<$className>(*state, ${name}Value);\n");
</span><del>- push(@$outputArray, "$indent if (UNLIKELY(state->hadException()))\n");
</del><ins>+ push(@$outputArray, "$indent if (UNLIKELY(throwScope.exception()))\n");
</ins><span class="cx"> push(@$outputArray, "$indent return JSValue::encode(jsUndefined());\n");
</span><span class="cx"> push(@$outputArray, "$indent if (UNLIKELY(!$optionalValue))\n");
</span><span class="cx"> push(@$outputArray, "$indent return throwArgumentMustBeEnumError(*state, throwScope, $argumentIndex, \"$name\", \"$visibleInterfaceName\", $quotedFunctionName, expectedEnumerationValues<$className>());\n");
</span><span class="lines">@@ -4042,7 +4042,7 @@
</span><span class="cx"> push(@$outputArray, " if (!$checkedArgument.isUndefinedOrNull()) {\n");
</span><span class="cx"> push(@$outputArray, " $name = $nativeValue;\n");
</span><span class="cx"> if ($mayThrowException) {
</span><del>- push(@$outputArray, " if (UNLIKELY(state->hadException()))\n");
</del><ins>+ push(@$outputArray, " if (UNLIKELY(throwScope.exception()))\n");
</ins><span class="cx"> push(@$outputArray, " return JSValue::encode(jsUndefined());\n");
</span><span class="cx"> }
</span><span class="cx"> push(@$outputArray, " if (UNLIKELY(!$name))\n");
</span><span class="lines">@@ -4085,7 +4085,7 @@
</span><span class="cx"> push(@$outputArray, " auto $name = ${outer}${nativeValue};\n");
</span><span class="cx"> $value = "WTFMove($name)";
</span><span class="cx"> if ($mayThrowException) {
</span><del>- push(@$outputArray, " if (UNLIKELY(state->hadException()))\n");
</del><ins>+ push(@$outputArray, " if (UNLIKELY(throwScope.exception()))\n");
</ins><span class="cx"> push(@$outputArray, " return JSValue::encode(jsUndefined());\n");
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -4466,7 +4466,7 @@
</span><span class="cx"> push(@implContent, "\n" . $indent . "setDOMException(state, ec);\n") if $raisesException;
</span><span class="cx">
</span><span class="cx"> if ($codeGenerator->ExtendedAttributeContains($function->signature->extendedAttributes->{"CallWith"}, "ScriptState")) {
</span><del>- push(@implContent, $indent . "if (UNLIKELY(state->hadException()))\n");
</del><ins>+ push(@implContent, $indent . "if (UNLIKELY(throwScope.exception()))\n");
</ins><span class="cx"> push(@implContent, $indent . " return JSValue::encode(jsUndefined());\n");
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5290,7 +5290,7 @@
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx">
</span><span class="cx"> AtomicString eventType = state->uncheckedArgument(0).toString(state)->toAtomicString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> ${interfaceName}Init eventInit;
</span><span class="lines">@@ -5299,7 +5299,7 @@
</span><span class="cx"> if (!initializerValue.isUndefinedOrNull()) {
</span><span class="cx"> // Given the above test, this will always yield an object.
</span><span class="cx"> JSObject* initializerObject = initializerValue.toObject(state);
</span><del>- ASSERT(!state->hadException());
</del><ins>+ ASSERT(!throwScope.exception());
</ins><span class="cx">
</span><span class="cx"> // Create the dictionary wrapper from the initializer object.
</span><span class="cx"> JSDictionary dictionary(state, initializerObject);
</span><span class="lines">@@ -5442,7 +5442,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ($codeGenerator->ExtendedAttributeContains($interface->extendedAttributes->{"ConstructorCallWith"}, "ScriptState")) {
</span><del>- push(@$outputArray, " if (UNLIKELY(state->hadException()))\n");
</del><ins>+ push(@$outputArray, " if (UNLIKELY(throwScope.exception()))\n");
</ins><span class="cx"> push(@$outputArray, " return JSValue::encode(jsUndefined());\n");
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestActiveDOMObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -224,7 +224,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto message = state->argument(0).toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.postMessage(WTFMove(message));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestCustomNamedGettercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto str = state->argument(0).toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.anotherFunction(WTFMove(str));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestEventConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx">
</span><span class="cx"> AtomicString eventType = state->uncheckedArgument(0).toString(state)->toAtomicString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="cx"> TestEventConstructorInit eventInit;
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> if (!initializerValue.isUndefinedOrNull()) {
</span><span class="cx"> // Given the above test, this will always yield an object.
</span><span class="cx"> JSObject* initializerObject = initializerValue.toObject(state);
</span><del>- ASSERT(!state->hadException());
</del><ins>+ ASSERT(!throwScope.exception());
</ins><span class="cx">
</span><span class="cx"> // Create the dictionary wrapper from the initializer object.
</span><span class="cx"> JSDictionary dictionary(state, initializerObject);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestEventTargetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -214,7 +214,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto index = convert<uint32_t>(*state, state->argument(0), NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> JSValue result = toJS(state, castedThis->globalObject(), impl.item(WTFMove(index)));
</span><span class="cx"> return JSValue::encode(result);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestGlobalObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGlobalObject.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGlobalObject.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGlobalObject.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -277,7 +277,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestGlobalObject* castedThis = jsDynamicCast<JSTestGlobalObject*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -285,7 +286,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = value.toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setRegularAttribute(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -296,7 +297,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestGlobalObject* castedThis = jsDynamicCast<JSTestGlobalObject*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -304,7 +306,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = value.toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setPublicAndPrivateAttribute(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -316,7 +318,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestGlobalObject* castedThis = jsDynamicCast<JSTestGlobalObject*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -324,7 +327,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = value.toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setPublicAndPrivateConditionalAttribute(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -337,7 +340,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestGlobalObject* castedThis = jsDynamicCast<JSTestGlobalObject*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -345,7 +349,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = value.toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setEnabledAtRuntimeAttribute(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -372,7 +376,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto testParam = state->argument(0).toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.regularOperation(WTFMove(testParam));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -393,7 +397,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto testParam = state->argument(0).toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.enabledAtRuntimeOperation(WTFMove(testParam));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -416,7 +420,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto testParam = convert<int32_t>(*state, state->argument(0), NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.enabledAtRuntimeOperation(WTFMove(testParam));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestInterfacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -231,10 +231,10 @@
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> auto str1 = state->argument(0).toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto str2 = state->argument(1).isUndefined() ? ASCIILiteral("defaultString") : state->uncheckedArgument(1).toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> ScriptExecutionContext* context = castedThis->scriptExecutionContext();
</span><span class="cx"> if (UNLIKELY(!context))
</span><span class="lines">@@ -663,9 +663,10 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> auto nativeValue = value.toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> TestInterface::setImplementsStaticAttr(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -678,7 +679,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestInterface* castedThis = jsDynamicCast<JSTestInterface*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -686,7 +688,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = value.toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setImplementsStr2(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -699,7 +701,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestInterface* castedThis = jsDynamicCast<JSTestInterface*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -716,7 +719,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestInterface* castedThis = jsDynamicCast<JSTestInterface*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -739,9 +743,10 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> auto nativeValue = value.toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> WebCore::TestSupplemental::setSupplementalStaticAttr(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -754,7 +759,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestInterface* castedThis = jsDynamicCast<JSTestInterface*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -762,7 +768,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = value.toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> WebCore::TestSupplemental::setSupplementalStr2(impl, WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -775,7 +781,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestInterface* castedThis = jsDynamicCast<JSTestInterface*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -792,7 +799,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestInterface* castedThis = jsDynamicCast<JSTestInterface*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -852,7 +860,7 @@
</span><span class="cx"> if (!context)
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto strArg = state->argument(0).toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto objArg = JSTestObj::toWrapped(state->argument(1));
</span><span class="cx"> if (UNLIKELY(!objArg))
</span><span class="lines">@@ -930,7 +938,7 @@
</span><span class="cx"> if (!context)
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto strArg = state->argument(0).toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto objArg = JSTestObj::toWrapped(state->argument(1));
</span><span class="cx"> if (UNLIKELY(!objArg))
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestJSBuiltinConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestJSBuiltinConstructor.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestJSBuiltinConstructor.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestJSBuiltinConstructor.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -190,7 +190,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestJSBuiltinConstructor* castedThis = jsDynamicCast<JSTestJSBuiltinConstructor*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestNamedConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -91,13 +91,13 @@
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> auto str1 = state->argument(0).toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto str2 = state->argument(1).isUndefined() ? ASCIILiteral("defaultString") : state->uncheckedArgument(1).toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto str3 = state->argument(2).isUndefined() ? String() : state->uncheckedArgument(2).toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto object = TestNamedConstructor::createForJSConstructor(*castedThis->document(), WTFMove(str1), WTFMove(str2), WTFMove(str3), ec);
</span><span class="cx"> if (UNLIKELY(ec)) {
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNode.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNode.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNode.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -207,7 +207,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestNode* castedThis = jsDynamicCast<JSTestNode*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -215,7 +216,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = value.toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setName(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestNondeterministiccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNondeterministic.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNondeterministic.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNondeterministic.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -361,7 +361,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestNondeterministic* castedThis = jsDynamicCast<JSTestNondeterministic*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -369,7 +370,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = value.toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setNondeterministicWriteableAttr(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -380,7 +381,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestNondeterministic* castedThis = jsDynamicCast<JSTestNondeterministic*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -388,7 +390,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = value.toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setNondeterministicExceptionAttr(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -399,7 +401,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestNondeterministic* castedThis = jsDynamicCast<JSTestNondeterministic*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -407,7 +410,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = value.toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setNondeterministicGetterExceptionAttr(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -418,7 +421,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestNondeterministic* castedThis = jsDynamicCast<JSTestNondeterministic*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -427,7 +431,7 @@
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> auto nativeValue = value.toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setNondeterministicSetterExceptionAttr(WTFMove(nativeValue), ec);
</span><span class="cx"> setDOMException(state, ec);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -525,97 +525,97 @@
</span><span class="cx"> return Nullopt;
</span><span class="cx"> }
</span><span class="cx"> auto enumerationValueWithoutDefault = convertOptional<TestObj::EnumType>(state, object->get(&state, Identifier::fromString(&state, "enumerationValueWithoutDefault")));
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return Nullopt;
</span><span class="cx"> auto enumerationValueWithDefault = convertOptional<TestObj::EnumType>(state, object->get(&state, Identifier::fromString(&state, "enumerationValueWithDefault")), TestObj::EnumType::EnumValue1);
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return Nullopt;
</span><span class="cx"> auto enumerationValueWithEmptyStringDefault = convertOptional<TestObj::EnumType>(state, object->get(&state, Identifier::fromString(&state, "enumerationValueWithEmptyStringDefault")), TestObj::EnumType::EmptyString);
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return Nullopt;
</span><span class="cx"> auto stringWithDefault = convertOptional<String>(state, object->get(&state, Identifier::fromString(&state, "stringWithDefault")), "defaultString");
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return Nullopt;
</span><span class="cx"> auto stringWithoutDefault = convertOptional<String>(state, object->get(&state, Identifier::fromString(&state, "stringWithoutDefault")));
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return Nullopt;
</span><span class="cx"> auto booleanWithDefault = convertOptional<bool>(state, object->get(&state, Identifier::fromString(&state, "booleanWithDefault")), false);
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return Nullopt;
</span><span class="cx"> auto booleanWithoutDefault = convertOptional<bool>(state, object->get(&state, Identifier::fromString(&state, "booleanWithoutDefault")));
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return Nullopt;
</span><span class="cx"> auto sequenceOfStrings = convertOptional<Vector<String>>(state, object->get(&state, Identifier::fromString(&state, "sequenceOfStrings")));
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return Nullopt;
</span><span class="cx"> auto restrictedDouble = convertOptional<double>(state, object->get(&state, Identifier::fromString(&state, "restrictedDouble")), ShouldAllowNonFinite::No);
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return Nullopt;
</span><span class="cx"> auto unrestrictedDouble = convertOptional<double>(state, object->get(&state, Identifier::fromString(&state, "unrestrictedDouble")), ShouldAllowNonFinite::Yes);
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return Nullopt;
</span><span class="cx"> auto restrictedDoubleWithDefault = convertOptional<double>(state, object->get(&state, Identifier::fromString(&state, "restrictedDoubleWithDefault")), ShouldAllowNonFinite::No, 0);
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return Nullopt;
</span><span class="cx"> auto unrestrictedDoubleWithDefault = convertOptional<double>(state, object->get(&state, Identifier::fromString(&state, "unrestrictedDoubleWithDefault")), ShouldAllowNonFinite::Yes, 0);
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return Nullopt;
</span><span class="cx"> auto restrictedFloat = convertOptional<float>(state, object->get(&state, Identifier::fromString(&state, "restrictedFloat")), ShouldAllowNonFinite::No);
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return Nullopt;
</span><span class="cx"> auto unrestrictedFloat = convertOptional<float>(state, object->get(&state, Identifier::fromString(&state, "unrestrictedFloat")), ShouldAllowNonFinite::Yes);
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return Nullopt;
</span><span class="cx"> auto restrictedFloatWithDefault = convertOptional<float>(state, object->get(&state, Identifier::fromString(&state, "restrictedFloatWithDefault")), ShouldAllowNonFinite::No, 0);
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return Nullopt;
</span><span class="cx"> auto unrestrictedFloatWithDefault = convertOptional<float>(state, object->get(&state, Identifier::fromString(&state, "unrestrictedFloatWithDefault")), ShouldAllowNonFinite::Yes, 0);
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return Nullopt;
</span><span class="cx"> auto smallIntegerClamped = convertOptional<int8_t>(state, object->get(&state, Identifier::fromString(&state, "smallIntegerClamped")), Clamp);
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return Nullopt;
</span><span class="cx"> auto smallIntegerWithDefault = convertOptional<int8_t>(state, object->get(&state, Identifier::fromString(&state, "smallIntegerWithDefault")), NormalConversion);
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return Nullopt;
</span><span class="cx"> auto smallUnsignedIntegerEnforcedRange = convertOptional<uint8_t>(state, object->get(&state, Identifier::fromString(&state, "smallUnsignedIntegerEnforcedRange")), EnforceRange);
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return Nullopt;
</span><span class="cx"> auto smallUnsignedIntegerWithDefault = convertOptional<uint8_t>(state, object->get(&state, Identifier::fromString(&state, "smallUnsignedIntegerWithDefault")), NormalConversion, 0);
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return Nullopt;
</span><span class="cx"> auto integer = convertOptional<int32_t>(state, object->get(&state, Identifier::fromString(&state, "integer")), NormalConversion);
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return Nullopt;
</span><span class="cx"> auto integerWithDefault = convertOptional<int32_t>(state, object->get(&state, Identifier::fromString(&state, "integerWithDefault")), NormalConversion, 0);
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return Nullopt;
</span><span class="cx"> auto unsignedInteger = convertOptional<uint32_t>(state, object->get(&state, Identifier::fromString(&state, "unsignedInteger")), NormalConversion);
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return Nullopt;
</span><span class="cx"> auto unsignedIntegerWithDefault = convertOptional<uint32_t>(state, object->get(&state, Identifier::fromString(&state, "unsignedIntegerWithDefault")), NormalConversion, 0);
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return Nullopt;
</span><span class="cx"> auto largeInteger = convertOptional<int64_t>(state, object->get(&state, Identifier::fromString(&state, "largeInteger")), NormalConversion);
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return Nullopt;
</span><span class="cx"> auto largeIntegerWithDefault = convertOptional<int64_t>(state, object->get(&state, Identifier::fromString(&state, "largeIntegerWithDefault")), NormalConversion, 0);
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return Nullopt;
</span><span class="cx"> auto unsignedLargeInteger = convertOptional<uint64_t>(state, object->get(&state, Identifier::fromString(&state, "unsignedLargeInteger")), NormalConversion);
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return Nullopt;
</span><span class="cx"> auto unsignedLargeIntegerWithDefault = convertOptional<uint64_t>(state, object->get(&state, Identifier::fromString(&state, "unsignedLargeIntegerWithDefault")), NormalConversion, 0);
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return Nullopt;
</span><span class="cx"> auto* nullableNode = convertWrapperType<Node, JSNode>(state, object->get(&state, Identifier::fromString(&state, "nullableNode")), IsNullable::Yes);
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return Nullopt;
</span><span class="cx"> auto anyValue = convertOptional<JSC::JSValue>(state, object->get(&state, Identifier::fromString(&state, "anyValue")), jsUndefined());
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return Nullopt;
</span><span class="cx"> auto anyTypedefValue = convertOptional<JSC::JSValue>(state, object->get(&state, Identifier::fromString(&state, "anyTypedefValue")), jsUndefined());
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return Nullopt;
</span><span class="cx"> auto dictionaryMember = convertDictionary<TestObj::DictionaryThatShouldTolerateNull>(state, object->get(&state, Identifier::fromString(&state, "dictionaryMember")));
</span><span class="cx"> return TestObj::Dictionary { WTFMove(enumerationValueWithoutDefault), WTFMove(enumerationValueWithDefault), WTFMove(enumerationValueWithEmptyStringDefault), WTFMove(stringWithDefault), WTFMove(stringWithoutDefault), WTFMove(booleanWithDefault), WTFMove(booleanWithoutDefault), WTFMove(sequenceOfStrings), WTFMove(restrictedDouble), WTFMove(unrestrictedDouble), WTFMove(restrictedDoubleWithDefault), WTFMove(unrestrictedDoubleWithDefault), WTFMove(restrictedFloat), WTFMove(unrestrictedFloat), WTFMove(restrictedFloatWithDefault), WTFMove(unrestrictedFloatWithDefault), WTFMove(smallIntegerClamped), WTFMove(smallIntegerWithDefault), WTFMove(smallUnsignedIntegerEnforcedRange), WTFMove(smallUnsignedIntegerWithDefault), WTFMove(integer), WTFMove(integerWithDefault), WTFMove(unsignedInteger), WTFMove(unsignedIntegerWithDefault), WTFMove(largeInteger), WTFMove(largeIntegerWithDefault), WTFMove(unsignedLargeInteger), WTFMove(unsignedLargeIntegerWithDefault), WT
FMove(nullableNode), WTFMove(anyValue), WTFMove(anyTypedefValue), dictionaryMember.value() };
</span><span class="lines">@@ -631,13 +631,13 @@
</span><span class="cx"> return Nullopt;
</span><span class="cx"> }
</span><span class="cx"> auto requiredEnumerationValue = convert<TestObj::EnumType>(state, object->get(&state, Identifier::fromString(&state, "requiredEnumerationValue")));
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return Nullopt;
</span><span class="cx"> auto booleanWithoutDefault = convertOptional<bool>(state, object->get(&state, Identifier::fromString(&state, "booleanWithoutDefault")));
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return Nullopt;
</span><span class="cx"> auto* nonNullableNode = convertWrapperType<Node, JSNode>(state, object->get(&state, Identifier::fromString(&state, "nonNullableNode")), IsNullable::No);
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return Nullopt;
</span><span class="cx"> auto requiredDictionaryMember = convertDictionary<TestObj::Dictionary>(state, object->get(&state, Identifier::fromString(&state, "requiredDictionaryMember")));
</span><span class="cx"> return TestObj::DictionaryThatShouldNotTolerateNull { WTFMove(requiredEnumerationValue), WTFMove(booleanWithoutDefault), *nonNullableNode, requiredDictionaryMember.value() };
</span><span class="lines">@@ -655,7 +655,7 @@
</span><span class="cx"> return Nullopt;
</span><span class="cx"> }
</span><span class="cx"> auto enumerationValue = convertOptional<TestObj::EnumType>(state, object->get(&state, Identifier::fromString(&state, "enumerationValue")));
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return Nullopt;
</span><span class="cx"> auto booleanWithoutDefault = convertOptional<bool>(state, object->get(&state, Identifier::fromString(&state, "booleanWithoutDefault")));
</span><span class="cx"> return TestObj::DictionaryThatShouldTolerateNull { WTFMove(enumerationValue), WTFMove(booleanWithoutDefault) };
</span><span class="lines">@@ -673,7 +673,7 @@
</span><span class="cx"> return Nullopt;
</span><span class="cx"> }
</span><span class="cx"> auto enumerationValue = convertOptional<TestObj::EnumType>(state, object->get(&state, Identifier::fromString(&state, "enumerationValue")));
</span><del>- if (UNLIKELY(state.hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return Nullopt;
</span><span class="cx"> auto booleanWithoutDefault = convertOptional<bool>(state, object->get(&state, Identifier::fromString(&state, "booleanWithoutDefault")));
</span><span class="cx"> return AlternateDictionaryName { WTFMove(enumerationValue), WTFMove(booleanWithoutDefault) };
</span><span class="lines">@@ -3090,9 +3090,10 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> auto nativeValue = value.toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> TestObj::setStaticStringAttr(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -3103,7 +3104,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3118,7 +3120,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3126,7 +3129,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = parse<TestObj::EnumType>(*state, value);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> if (UNLIKELY(!nativeValue))
</span><span class="cx"> return false;
</span><span class="lines">@@ -3139,7 +3142,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3147,7 +3151,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = convert<int8_t>(*state, value, NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setByteAttr(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -3158,7 +3162,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3166,7 +3171,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = convert<uint8_t>(*state, value, NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setOctetAttr(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -3177,7 +3182,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3185,7 +3191,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = convert<int16_t>(*state, value, NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setShortAttr(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -3196,7 +3202,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3204,7 +3211,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = convert<int16_t>(*state, value, Clamp);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setClampedShortAttr(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -3215,7 +3222,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3223,7 +3231,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = convert<int16_t>(*state, value, EnforceRange);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setEnforceRangeShortAttr(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -3234,7 +3242,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3242,7 +3251,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = convert<uint16_t>(*state, value, NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setUnsignedShortAttr(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -3253,7 +3262,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3261,7 +3271,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = convert<int32_t>(*state, value, NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setLongAttr(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -3272,7 +3282,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3280,7 +3291,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = convert<int64_t>(*state, value, NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setLongLongAttr(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -3291,7 +3302,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3299,7 +3311,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = convert<uint64_t>(*state, value, NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setUnsignedLongLongAttr(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -3310,7 +3322,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3318,7 +3331,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = value.toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setStringAttr(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -3329,7 +3342,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3337,7 +3351,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = valueToUSVString(state, value);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setUsvstringAttr(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -3348,7 +3362,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3369,7 +3384,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3393,7 +3409,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3414,7 +3431,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3422,7 +3440,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = valueToStringTreatingNullAsEmptyString(state, value);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setStringAttrTreatingNullAsEmptyString(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -3433,7 +3451,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3441,7 +3460,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = valueToUSVStringTreatingNullAsEmptyString(state, value);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setUsvstringAttrTreatingNullAsEmptyString(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -3452,7 +3471,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3460,7 +3480,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = parse<AlternateEnumName>(*state, value);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> if (UNLIKELY(!nativeValue))
</span><span class="cx"> return false;
</span><span class="lines">@@ -3473,7 +3493,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3494,7 +3515,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3502,7 +3524,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = value.toBoolean(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setCreate(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -3513,7 +3535,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3521,7 +3544,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = value.toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setAttributeWithoutSynchronization(WebCore::HTMLNames::reflectedstringattrAttr, WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -3532,7 +3555,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3540,7 +3564,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = valueToUSVString(state, value);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setAttributeWithoutSynchronization(WebCore::HTMLNames::reflectedusvstringattrAttr, WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -3551,7 +3575,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3559,7 +3584,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = convert<int32_t>(*state, value, NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setIntegralAttribute(WebCore::HTMLNames::reflectedintegralattrAttr, WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -3570,7 +3595,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3578,7 +3604,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = convert<uint32_t>(*state, value, NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setUnsignedIntegralAttribute(WebCore::HTMLNames::reflectedunsignedintegralattrAttr, WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -3589,7 +3615,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3597,7 +3624,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = value.toBoolean(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setBooleanAttribute(WebCore::HTMLNames::reflectedbooleanattrAttr, WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -3608,7 +3635,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3616,7 +3644,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = value.toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setAttributeWithoutSynchronization(WebCore::HTMLNames::reflectedurlattrAttr, WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -3627,7 +3655,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3635,7 +3664,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = valueToUSVString(state, value);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setAttributeWithoutSynchronization(WebCore::HTMLNames::reflectedusvurlattrAttr, WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -3646,7 +3675,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3654,7 +3684,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = value.toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setAttributeWithoutSynchronization(WebCore::HTMLNames::customContentStringAttrAttr, WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -3665,7 +3695,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3673,7 +3704,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = convert<int32_t>(*state, value, NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setIntegralAttribute(WebCore::HTMLNames::customContentIntegralAttrAttr, WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -3684,7 +3715,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3692,7 +3724,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = value.toBoolean(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setBooleanAttribute(WebCore::HTMLNames::customContentBooleanAttrAttr, WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -3703,7 +3735,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3711,7 +3744,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = value.toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setAttributeWithoutSynchronization(WebCore::HTMLNames::customContentURLAttrAttr, WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -3723,7 +3756,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3731,7 +3765,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = value.toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setEnabledAtRuntimeAttribute(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -3743,7 +3777,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3751,7 +3786,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = toFloat32Array(value);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> if (UNLIKELY(!nativeValue)) {
</span><span class="cx"> throwAttributeTypeError(*state, throwScope, "TestObject", "typedArrayAttr", "Float32Array");
</span><span class="lines">@@ -3766,7 +3801,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3774,7 +3810,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = convert<int32_t>(*state, value, NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setAttrWithGetterException(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -3785,7 +3821,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3793,7 +3830,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = convert<int32_t>(*state, value, NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setAttrWithGetterExceptionWithMessage(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -3804,7 +3841,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3813,7 +3851,7 @@
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> auto nativeValue = convert<int32_t>(*state, value, NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setAttrWithSetterException(WTFMove(nativeValue), ec);
</span><span class="cx"> setDOMException(state, ec);
</span><span class="lines">@@ -3825,7 +3863,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3834,7 +3873,7 @@
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> ExceptionCodeWithMessage ec;
</span><span class="cx"> auto nativeValue = convert<int32_t>(*state, value, NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setAttrWithSetterExceptionWithMessage(WTFMove(nativeValue), ec);
</span><span class="cx"> setDOMException(state, ec);
</span><span class="lines">@@ -3846,7 +3885,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3854,7 +3894,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = value.toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setStringAttrWithGetterException(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -3865,7 +3905,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3874,7 +3915,7 @@
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> auto nativeValue = value.toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setStringAttrWithSetterException(WTFMove(nativeValue), ec);
</span><span class="cx"> setDOMException(state, ec);
</span><span class="lines">@@ -3886,7 +3927,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3901,7 +3943,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3916,7 +3959,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3931,7 +3975,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3939,7 +3984,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = convert<int32_t>(*state, value, NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setWithScriptStateAttribute(*state, WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -3950,7 +3995,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3958,7 +4004,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = convert<int32_t>(*state, value, NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setWithCallWithAndSetterCallWithAttribute(*state, activeDOMWindow(state), firstDOMWindow(state), WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -3969,7 +4015,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -3993,7 +4040,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -4014,7 +4062,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -4038,7 +4087,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -4062,7 +4112,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -4086,7 +4137,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -4110,7 +4162,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -4132,7 +4185,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -4140,7 +4194,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = convert<int32_t>(*state, value, NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setConditionalAttr1(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -4153,7 +4207,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -4161,7 +4216,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = convert<int32_t>(*state, value, NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setConditionalAttr2(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -4174,7 +4229,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -4182,7 +4238,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = convert<int32_t>(*state, value, NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setConditionalAttr3(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -4195,7 +4251,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -4212,7 +4269,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -4229,7 +4287,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -4245,7 +4304,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -4262,7 +4322,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -4286,7 +4347,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -4310,7 +4372,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -4318,7 +4381,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = convert<int32_t>(*state, value, NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setBlueberry(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -4329,7 +4392,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -4337,7 +4401,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = convert<int32_t>(*state, value, NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setId(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -4348,7 +4412,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -4363,7 +4428,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -4371,7 +4437,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = convert<int32_t>(*state, value, NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setNullableLongSettableAttribute(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -4382,7 +4448,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -4390,7 +4457,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = valueToStringWithUndefinedOrNullCheck(state, value);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setNullableStringSettableAttribute(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -4401,7 +4468,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -4409,7 +4477,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = valueToUSVStringWithUndefinedOrNullCheck(state, value);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setNullableUSVStringSettableAttribute(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -4420,7 +4488,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -4428,7 +4497,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = convert<int32_t>(*state, value, NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setNullableStringValue(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -4439,7 +4508,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -4447,7 +4517,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = parse<TestObj::Optional>(*state, value);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> if (UNLIKELY(!nativeValue))
</span><span class="cx"> return false;
</span><span class="lines">@@ -4460,7 +4530,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -4469,7 +4540,7 @@
</span><span class="cx"> Ref<TestNode> forwardedImpl = castedThis->wrapped().putForwardsAttribute();
</span><span class="cx"> auto& impl = forwardedImpl.get();
</span><span class="cx"> auto nativeValue = value.toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setName(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -4480,7 +4551,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -4491,7 +4563,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> auto& impl = *forwardedImpl;
</span><span class="cx"> auto nativeValue = value.toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setName(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -4502,7 +4574,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestObj* castedThis = jsDynamicCast<JSTestObj*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -4510,7 +4583,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = valueToUSVString(state, value);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setStringifierAttribute(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -4546,7 +4619,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto testParam = state->argument(0).toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.enabledAtRuntimeOperation(WTFMove(testParam));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -4569,7 +4642,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto testParam = convert<int32_t>(*state, state->argument(0), NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.enabledAtRuntimeOperation(WTFMove(testParam));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -4627,10 +4700,10 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 3))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto longArg = convert<int32_t>(*state, state->argument(0), NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto strArg = state->argument(1).toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto objArg = JSTestObj::toWrapped(state->argument(2));
</span><span class="cx"> if (UNLIKELY(!objArg))
</span><span class="lines">@@ -4668,10 +4741,10 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 3))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto byteArg = convert<int8_t>(*state, state->argument(0), NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto strArg = state->argument(1).toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto objArg = JSTestObj::toWrapped(state->argument(2));
</span><span class="cx"> if (UNLIKELY(!objArg))
</span><span class="lines">@@ -4709,10 +4782,10 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 3))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto octetArg = convert<uint8_t>(*state, state->argument(0), NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto strArg = state->argument(1).toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto objArg = JSTestObj::toWrapped(state->argument(2));
</span><span class="cx"> if (UNLIKELY(!objArg))
</span><span class="lines">@@ -4750,10 +4823,10 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 3))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto longArg = convert<int32_t>(*state, state->argument(0), NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto strArg = state->argument(1).toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto objArg = JSTestObj::toWrapped(state->argument(2));
</span><span class="cx"> if (UNLIKELY(!objArg))
</span><span class="lines">@@ -4791,10 +4864,10 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 3))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto longArg = convert<int32_t>(*state, state->argument(0), NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto strArg = state->argument(1).toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto objArg = JSTestObj::toWrapped(state->argument(2));
</span><span class="cx"> if (UNLIKELY(!objArg))
</span><span class="lines">@@ -4832,7 +4905,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto arg = valueToStringTreatingNullAsEmptyString(state, state->argument(0));
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithArgTreatingNullAsEmptyString(WTFMove(arg));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -4852,7 +4925,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto resolver = JSXPathNSResolver::toWrapped(*state, state->argument(0));
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> if (UNLIKELY(!resolver))
</span><span class="cx"> return throwArgumentTypeError(*state, throwScope, 0, "resolver", "TestObject", "methodWithXPathNSResolverParameter", "XPathNSResolver");
</span><span class="lines">@@ -4898,7 +4971,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto index = convert<uint32_t>(*state, state->argument(0), NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> JSValue result = jsStringOrNull(state, impl.nullableStringSpecialMethod(WTFMove(index)));
</span><span class="cx"> return JSValue::encode(result);
</span><span class="lines">@@ -4920,7 +4993,7 @@
</span><span class="cx"> auto enumArgValue = state->argument(0);
</span><span class="cx"> TestObj::EnumType enumArg;
</span><span class="cx"> auto optionalValue = parse<TestObj::EnumType>(*state, enumArgValue);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> if (UNLIKELY(!optionalValue))
</span><span class="cx"> return throwArgumentMustBeEnumError(*state, throwScope, 0, "enumArg", "TestObject", "methodWithEnumArg", expectedEnumerationValues<TestObj::EnumType>());
</span><span class="lines">@@ -4944,7 +5017,7 @@
</span><span class="cx"> Optional<TestObj::EnumType> enumArg;
</span><span class="cx"> if (!enumArgValue.isUndefined()) {
</span><span class="cx"> enumArg = parse<TestObj::EnumType>(*state, enumArgValue);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> if (UNLIKELY(!enumArg))
</span><span class="cx"> return throwArgumentMustBeEnumError(*state, throwScope, 0, "enumArg", "TestObject", "methodWithOptionalEnumArg", expectedEnumerationValues<TestObj::EnumType>());
</span><span class="lines">@@ -4970,7 +5043,7 @@
</span><span class="cx"> enumArg = TestObj::EnumType::EnumValue1;
</span><span class="cx"> } else {
</span><span class="cx"> auto optionalValue = parse<TestObj::EnumType>(*state, enumArgValue);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> if (UNLIKELY(!optionalValue))
</span><span class="cx"> return throwArgumentMustBeEnumError(*state, throwScope, 0, "enumArg", "TestObject", "methodWithOptionalEnumArgAndDefaultValue", expectedEnumerationValues<TestObj::EnumType>());
</span><span class="lines">@@ -4995,7 +5068,7 @@
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> auto strArg = state->argument(0).toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto objArg = JSTestObj::toWrapped(state->argument(1));
</span><span class="cx"> if (UNLIKELY(!objArg))
</span><span class="lines">@@ -5020,7 +5093,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto str = valueToUSVString(state, state->argument(0));
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithUSVStringArg(WTFMove(str));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -5040,7 +5113,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto str = valueToUSVStringWithUndefinedOrNullCheck(state, state->argument(0));
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithNullableUSVStringArg(WTFMove(str));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -5060,7 +5133,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto str = valueToUSVStringTreatingNullAsEmptyString(state, state->argument(0));
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithUSVStringArgTreatingNullAsEmptyString(WTFMove(str));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -5080,7 +5153,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto serializedArg = SerializedScriptValue::create(state, state->argument(0), 0, 0);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.serializedValue(WTFMove(serializedArg));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -5179,7 +5252,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto argument = state->argument(0).toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> JSValue result = jsStringWithCache(state, impl.privateMethod(WTFMove(argument)));
</span><span class="cx"> return JSValue::encode(result);
</span><span class="lines">@@ -5199,7 +5272,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto argument = state->argument(0).toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> JSValue result = jsStringWithCache(state, impl.publicAndPrivateMethod(WTFMove(argument)));
</span><span class="cx"> return JSValue::encode(result);
</span><span class="lines">@@ -5219,13 +5292,13 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 2))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto type = state->argument(0).toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto listener = JSEventListener::create(state->argument(1), *castedThis, false, currentWorld(state));
</span><span class="cx"> if (UNLIKELY(!listener))
</span><span class="cx"> return throwArgumentTypeError(*state, throwScope, 1, "listener", "TestObject", "addEventListener", "EventListener");
</span><span class="cx"> auto useCapture = state->argument(2).toBoolean(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.addEventListener(WTFMove(type), *listener, WTFMove(useCapture));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -5245,13 +5318,13 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 2))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto type = state->argument(0).toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto listener = JSEventListener::create(state->argument(1), *castedThis, false, currentWorld(state));
</span><span class="cx"> if (UNLIKELY(!listener))
</span><span class="cx"> return throwArgumentTypeError(*state, throwScope, 1, "listener", "TestObject", "removeEventListener", "EventListener");
</span><span class="cx"> auto useCapture = state->argument(2).toBoolean(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.removeEventListener(WTFMove(type), *listener, WTFMove(useCapture));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -5284,7 +5357,7 @@
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> JSValue result = toJS(state, castedThis->globalObject(), impl.withScriptStateObj(*state));
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> return JSValue::encode(result);
</span><span class="cx"> }
</span><span class="lines">@@ -5321,7 +5394,7 @@
</span><span class="cx"> JSValue result = toJS(state, castedThis->globalObject(), impl.withScriptStateObjException(*state, ec));
</span><span class="cx">
</span><span class="cx"> setDOMException(state, ec);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> return JSValue::encode(result);
</span><span class="cx"> }
</span><span class="lines">@@ -5380,7 +5453,7 @@
</span><span class="cx"> JSValue result = toJS(state, castedThis->globalObject(), impl.withScriptExecutionContextAndScriptStateObjException(*state, *context, ec));
</span><span class="cx">
</span><span class="cx"> setDOMException(state, ec);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> return JSValue::encode(result);
</span><span class="cx"> }
</span><span class="lines">@@ -5400,7 +5473,7 @@
</span><span class="cx"> if (!context)
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> JSValue result = toJS(state, castedThis->globalObject(), impl.withScriptExecutionContextAndScriptStateWithSpaces(*state, *context));
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> return JSValue::encode(result);
</span><span class="cx"> }
</span><span class="lines">@@ -5486,7 +5559,7 @@
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto opt = state->argument(0).isUndefined() ? Optional<int32_t>() : convert<int32_t>(*state, state->uncheckedArgument(0), NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithOptionalArg(WTFMove(opt));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -5504,7 +5577,7 @@
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto opt = state->argument(0).isUndefined() ? 666 : convert<int32_t>(*state, state->uncheckedArgument(0), NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithOptionalArgAndDefaultValue(WTFMove(opt));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -5524,10 +5597,10 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto nonOpt = convert<int32_t>(*state, state->argument(0), NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto opt = state->argument(1).isUndefined() ? Optional<int32_t>() : convert<int32_t>(*state, state->uncheckedArgument(1), NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithNonOptionalArgAndOptionalArg(WTFMove(nonOpt), WTFMove(opt));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -5547,13 +5620,13 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto nonOpt = convert<int32_t>(*state, state->argument(0), NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto opt1 = state->argument(1).isUndefined() ? Optional<int32_t>() : convert<int32_t>(*state, state->uncheckedArgument(1), NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto opt2 = state->argument(2).isUndefined() ? Optional<int32_t>() : convert<int32_t>(*state, state->uncheckedArgument(2), NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithNonOptionalArgAndTwoOptionalArgs(WTFMove(nonOpt), WTFMove(opt1), WTFMove(opt2));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -5571,7 +5644,7 @@
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto str = state->argument(0).isUndefined() ? String() : state->uncheckedArgument(0).toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithOptionalString(WTFMove(str));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -5589,7 +5662,7 @@
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto str = state->argument(0).isUndefined() ? String() : valueToUSVString(state, state->uncheckedArgument(0));
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithOptionalUSVString(WTFMove(str));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -5607,7 +5680,7 @@
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto str = state->argument(0).isUndefined() ? nullAtom : state->uncheckedArgument(0).toString(state)->toAtomicString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithOptionalAtomicString(WTFMove(str));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -5625,7 +5698,7 @@
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto str = state->argument(0).isUndefined() ? ASCIILiteral("foo") : state->uncheckedArgument(0).toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithOptionalStringAndDefaultValue(WTFMove(str));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -5643,7 +5716,7 @@
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto str = state->argument(0).isUndefined() ? AtomicString("foo", AtomicString::ConstructFromLiteral) : state->uncheckedArgument(0).toString(state)->toAtomicString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithOptionalAtomicStringAndDefaultValue(WTFMove(str));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -5661,7 +5734,7 @@
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto str = state->argument(0).isUndefined() ? String() : state->uncheckedArgument(0).toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithOptionalStringIsNull(WTFMove(str));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -5679,7 +5752,7 @@
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto str = state->argument(0).toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithOptionalStringIsUndefined(WTFMove(str));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -5697,7 +5770,7 @@
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto str = state->argument(0).isUndefined() ? nullAtom : state->uncheckedArgument(0).toString(state)->toAtomicString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithOptionalAtomicStringIsNull(WTFMove(str));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -5715,7 +5788,7 @@
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto str = state->argument(0).isUndefined() ? emptyString() : state->uncheckedArgument(0).toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithOptionalStringIsEmptyString(WTFMove(str));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -5733,7 +5806,7 @@
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto str = state->argument(0).isUndefined() ? emptyString() : valueToUSVString(state, state->uncheckedArgument(0));
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithOptionalUSVStringIsEmptyString(WTFMove(str));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -5751,7 +5824,7 @@
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto str = state->argument(0).isUndefined() ? emptyAtom : state->uncheckedArgument(0).toString(state)->toAtomicString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithOptionalAtomicStringIsEmptyString(WTFMove(str));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -5769,7 +5842,7 @@
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto number = convert<double>(*state, state->argument(0), ShouldAllowNonFinite::Yes);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithOptionalDoubleIsNaN(WTFMove(number));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -5787,7 +5860,7 @@
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto number = convert<float>(*state, state->argument(0), ShouldAllowNonFinite::Yes);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithOptionalFloatIsNaN(WTFMove(number));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -5805,7 +5878,7 @@
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto number = state->argument(0).isUndefined() ? Optional<int64_t>() : convert<int64_t>(*state, state->uncheckedArgument(0), NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithOptionalLongLong(WTFMove(number));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -5823,7 +5896,7 @@
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto number = convert<int64_t>(*state, state->argument(0), NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithOptionalLongLongIsZero(WTFMove(number));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -5841,7 +5914,7 @@
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto number = state->argument(0).isUndefined() ? Optional<uint64_t>() : convert<uint64_t>(*state, state->uncheckedArgument(0), NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithOptionalUnsignedLongLong(WTFMove(number));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -5859,7 +5932,7 @@
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto number = convert<uint64_t>(*state, state->argument(0), NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithOptionalUnsignedLongLongIsZero(WTFMove(number));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -5877,7 +5950,7 @@
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto array = state->argument(0).isUndefined() ? Optional<Vector<String>>() : toNativeArray<String>(*state, state->uncheckedArgument(0));
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithOptionalSequence(WTFMove(array));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -5895,7 +5968,7 @@
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto array = state->argument(0).isUndefined() ? Vector<String>() : toNativeArray<String>(*state, state->uncheckedArgument(0));
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithOptionalSequenceIsEmpty(WTFMove(array));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -5913,7 +5986,7 @@
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto b = state->argument(0).isUndefined() ? Optional<bool>() : state->uncheckedArgument(0).toBoolean(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithOptionalBoolean(WTFMove(b));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -5931,7 +6004,7 @@
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto b = state->argument(0).toBoolean(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithOptionalBooleanIsFalse(WTFMove(b));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -6009,7 +6082,7 @@
</span><span class="cx"> RefPtr<XPathNSResolver> resolver = nullptr;
</span><span class="cx"> if (!state->argument(0).isUndefinedOrNull()) {
</span><span class="cx"> resolver = JSXPathNSResolver::toWrapped(*state, state->uncheckedArgument(0));
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> if (UNLIKELY(!resolver))
</span><span class="cx"> return throwArgumentTypeError(*state, throwScope, 0, "resolver", "TestObject", "methodWithOptionalXPathNSResolver", "XPathNSResolver");
</span><span class="lines">@@ -6052,7 +6125,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 2))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto nonCallback = convert<int32_t>(*state, state->argument(0), NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> if (UNLIKELY(!state->argument(1).isObject()))
</span><span class="cx"> return throwArgumentMustBeFunctionError(*state, throwScope, 1, "callback", "TestObject", "methodWithNonCallbackArgAndCallbackArg");
</span><span class="lines">@@ -6116,7 +6189,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 2))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto nonCallback = convert<int32_t>(*state, state->argument(0), NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> if (UNLIKELY(!state->argument(1).isFunction()))
</span><span class="cx"> return throwArgumentMustBeFunctionError(*state, throwScope, 1, "callback", "TestObject", "methodWithNonCallbackArgAndCallbackFunctionArg");
</span><span class="lines">@@ -6249,7 +6322,7 @@
</span><span class="cx"> return throwArgumentTypeError(*state, throwScope, 0, "objArg", "TestObject", "overloadedMethod", "TestObj");
</span><span class="cx"> }
</span><span class="cx"> auto strArg = state->argument(1).toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.overloadedMethod(WTFMove(objArg), WTFMove(strArg));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -6275,7 +6348,7 @@
</span><span class="cx"> return throwArgumentTypeError(*state, throwScope, 0, "objArg", "TestObject", "overloadedMethod", "TestObj");
</span><span class="cx"> }
</span><span class="cx"> auto longArg = state->argument(1).isUndefined() ? Optional<int32_t>() : convert<int32_t>(*state, state->uncheckedArgument(1), NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.overloadedMethod(WTFMove(objArg), WTFMove(longArg));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -6295,7 +6368,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto strArg = state->argument(0).toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.overloadedMethod(WTFMove(strArg));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -6315,7 +6388,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto longArg = convert<int32_t>(*state, state->argument(0), NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.overloadedMethod(WTFMove(longArg));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -6378,7 +6451,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto arrayArg = toNativeArray<String>(*state, state->argument(0));
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.overloadedMethod(WTFMove(arrayArg));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -6418,7 +6491,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto arrayArg = toNativeArray<String>(*state, state->argument(0));
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.overloadedMethod(WTFMove(arrayArg));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -6438,7 +6511,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto arrayArg = toNativeArray<uint32_t>(*state, state->argument(0));
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.overloadedMethod(WTFMove(arrayArg));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -6458,7 +6531,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto strArg = state->argument(0).toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.overloadedMethod(WTFMove(strArg));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -6540,7 +6613,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto strArg = state->argument(0).toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> TestObj* objArg = nullptr;
</span><span class="cx"> if (!state->argument(1).isUndefinedOrNull()) {
</span><span class="lines">@@ -6572,7 +6645,7 @@
</span><span class="cx"> return throwArgumentTypeError(*state, throwScope, 0, "objArg", "TestObject", "overloadedMethodWithOptionalParameter", "TestObj");
</span><span class="cx"> }
</span><span class="cx"> auto longArg = state->argument(1).isUndefined() ? Optional<int32_t>() : convert<int32_t>(*state, state->uncheckedArgument(1), NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.overloadedMethodWithOptionalParameter(WTFMove(objArg), WTFMove(longArg));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -6618,7 +6691,7 @@
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx"> UNUSED_PARAM(throwScope);
</span><span class="cx"> auto arg = state->argument(0).isUndefined() ? Optional<int32_t>() : convert<int32_t>(*state, state->uncheckedArgument(0), NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> JSValue result = jsNumber(TestObj::classMethodWithOptional(WTFMove(arg)));
</span><span class="cx"> return JSValue::encode(result);
</span><span class="lines">@@ -6643,7 +6716,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto arg = convert<int32_t>(*state, state->argument(0), NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> TestObj::overloadedMethod1(WTFMove(arg));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -6660,7 +6733,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto type = state->argument(0).toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> TestObj::overloadedMethod1(WTFMove(type));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -6703,10 +6776,10 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 2))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto objArgsShort = convert<uint16_t>(*state, state->argument(0), Clamp);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto objArgsLong = convert<uint32_t>(*state, state->argument(1), Clamp);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.classMethodWithClamp(WTFMove(objArgsShort), WTFMove(objArgsLong));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -6726,10 +6799,10 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 2))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto objArgsShort = convert<uint16_t>(*state, state->argument(0), EnforceRange);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto objArgsLong = convert<uint32_t>(*state, state->argument(1), EnforceRange);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.classMethodWithEnforceRange(WTFMove(objArgsShort), WTFMove(objArgsLong));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -6749,7 +6822,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto unsignedLongSequence = toNativeArray<uint32_t>(*state, state->argument(0));
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithUnsignedLongSequence(WTFMove(unsignedLongSequence));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -6770,7 +6843,7 @@
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> auto values = toNativeArray<String>(*state, state->argument(0));
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> JSValue result = jsArray(state, castedThis->globalObject(), impl.stringArrayFunction(WTFMove(values), ec));
</span><span class="cx">
</span><span class="lines">@@ -6815,10 +6888,10 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 2))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto arrayArg = toNativeArray<uint32_t>(*state, state->argument(0));
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto nullableArrayArg = toNativeArray<uint32_t>(*state, state->argument(1));
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.methodWithAndWithoutNullableSequence(WTFMove(arrayArg), WTFMove(nullableArrayArg));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -6838,7 +6911,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto elementId = AtomicString(state->argument(0).toString(state)->toExistingAtomicString(state));
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> JSValue result = toJS(state, castedThis->globalObject(), impl.getElementById(WTFMove(elementId)));
</span><span class="cx"> return JSValue::encode(result);
</span><span class="lines">@@ -6921,7 +6994,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto value = state->argument(0).toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.convert3(WTFMove(value));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -6941,7 +7014,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto value = valueToStringWithUndefinedOrNullCheck(state, state->argument(0));
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.convert4(WTFMove(value));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -7006,10 +7079,10 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto head = state->argument(0).toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto tail = toArguments<VariadicHelper<JSC::JSValue, String>>(*state, 1);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.variadicStringMethod(WTFMove(head), WTFMove(*tail.second));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -7029,10 +7102,10 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto head = convert<double>(*state, state->argument(0), ShouldAllowNonFinite::Yes);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto tail = toArguments<VariadicHelper<JSC::JSValue, double>>(*state, 1);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.variadicDoubleMethod(WTFMove(head), WTFMove(*tail.second));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -7075,10 +7148,10 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 2))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto a = convert<float>(*state, state->argument(0), ShouldAllowNonFinite::Yes);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto b = convert<int32_t>(*state, state->argument(1), NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.any(WTFMove(a), WTFMove(b));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -7125,7 +7198,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto a = convert<float>(*state, state->argument(0), ShouldAllowNonFinite::No);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.testPromiseFunctionWithFloatArgument(WTFMove(a), DeferredWrapper::create(state, castedThis->globalObject(), promiseDeferred));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -7172,7 +7245,7 @@
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestObj::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto a = state->argument(0).isUndefined() ? Optional<int32_t>() : convert<int32_t>(*state, state->uncheckedArgument(0), NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.testPromiseFunctionWithOptionalIntArgument(WTFMove(a), DeferredWrapper::create(state, castedThis->globalObject(), promiseDeferred));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -7198,7 +7271,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto a = convert<float>(*state, state->argument(0), ShouldAllowNonFinite::No);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.testPromiseOverloadedFunction(WTFMove(a), DeferredWrapper::create(state, castedThis->globalObject(), promiseDeferred));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -7312,7 +7385,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto str = state->argument(0).toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.conditionalOverload(WTFMove(str));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -7335,7 +7408,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto a = convert<int32_t>(*state, state->argument(0), NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.conditionalOverload(WTFMove(a));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -7378,7 +7451,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto str = state->argument(0).toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.singleConditionalOverload(WTFMove(str));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -7399,7 +7472,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto a = convert<int32_t>(*state, state->argument(0), NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.singleConditionalOverload(WTFMove(a));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -7438,7 +7511,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto init = convertDictionary<TestObj::Dictionary>(*state, state->argument(0));
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.attachShadowRoot(init.value());
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestOverloadedConstructorscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto arrayBuffer = toArrayBuffer(state->argument(0));
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> if (UNLIKELY(!arrayBuffer))
</span><span class="cx"> return throwArgumentTypeError(*state, throwScope, 0, "arrayBuffer", "TestOverloadedConstructors", nullptr, "ArrayBuffer");
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto arrayBufferView = toArrayBufferView(state->argument(0));
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> if (UNLIKELY(!arrayBufferView))
</span><span class="cx"> return throwArgumentTypeError(*state, throwScope, 0, "arrayBufferView", "TestOverloadedConstructors", nullptr, "ArrayBufferView");
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto string = state->argument(0).toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto object = TestOverloadedConstructors::create(WTFMove(string));
</span><span class="cx"> return JSValue::encode(toJSNewlyCreated(state, castedThis->globalObject(), WTFMove(object)));
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> auto* castedThis = jsCast<JSTestOverloadedConstructorsConstructor*>(state->callee());
</span><span class="cx"> ASSERT(castedThis);
</span><span class="cx"> auto longArgs = toArguments<VariadicHelper<JSC::JSValue, int32_t>>(*state, 0);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto object = TestOverloadedConstructors::create(WTFMove(longArgs));
</span><span class="cx"> return JSValue::encode(toJSNewlyCreated(state, castedThis->globalObject(), WTFMove(object)));
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestOverloadedConstructorsWithSequencecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructorsWithSequence.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructorsWithSequence.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructorsWithSequence.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> auto* castedThis = jsCast<JSTestOverloadedConstructorsWithSequenceConstructor*>(state->callee());
</span><span class="cx"> ASSERT(castedThis);
</span><span class="cx"> auto sequenceOfStrings = state->argument(0).isUndefined() ? Vector<String>() : toNativeArray<String>(*state, state->uncheckedArgument(0));
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto object = TestOverloadedConstructorsWithSequence::create(WTFMove(sequenceOfStrings));
</span><span class="cx"> return JSValue::encode(toJSNewlyCreated(state, castedThis->globalObject(), WTFMove(object)));
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto string = state->argument(0).toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto object = TestOverloadedConstructorsWithSequence::create(WTFMove(string));
</span><span class="cx"> return JSValue::encode(toJSNewlyCreated(state, castedThis->globalObject(), WTFMove(object)));
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestOverrideBuiltinscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -210,7 +210,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto name = state->argument(0).toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> JSValue result = toJS(state, castedThis->globalObject(), impl.namedItem(WTFMove(name)));
</span><span class="cx"> return JSValue::encode(result);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestSerializedScriptValueInterfacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -251,7 +251,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestSerializedScriptValueInterface* castedThis = jsDynamicCast<JSTestSerializedScriptValueInterface*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -259,7 +260,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = SerializedScriptValue::create(state, value, 0, 0);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setValue(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -270,7 +271,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestSerializedScriptValueInterface* castedThis = jsDynamicCast<JSTestSerializedScriptValueInterface*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -278,7 +280,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = SerializedScriptValue::create(state, value, 0, 0);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setCachedValue(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestTypedefscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 2))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto hello = state->argument(0).toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> if (UNLIKELY(!state->argument(1).isObject()))
</span><span class="cx"> return throwArgumentMustBeFunctionError(*state, throwScope, 1, "testCallback", "TestTypedefs", nullptr);
</span><span class="lines">@@ -360,7 +360,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestTypedefs* castedThis = jsDynamicCast<JSTestTypedefs*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -368,7 +369,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = convert<uint64_t>(*state, value, NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setUnsignedLongLongAttr(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -379,7 +380,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestTypedefs* castedThis = jsDynamicCast<JSTestTypedefs*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -387,7 +389,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = SerializedScriptValue::create(state, value, 0, 0);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setImmutableSerializedScriptValue(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -398,7 +400,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestTypedefs* castedThis = jsDynamicCast<JSTestTypedefs*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -406,7 +409,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = convert<int32_t>(*state, value, NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setAttrWithGetterException(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -417,7 +420,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestTypedefs* castedThis = jsDynamicCast<JSTestTypedefs*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -426,7 +430,7 @@
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> auto nativeValue = convert<int32_t>(*state, value, NormalConversion);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setAttrWithSetterException(WTFMove(nativeValue), ec);
</span><span class="cx"> setDOMException(state, ec);
</span><span class="lines">@@ -438,7 +442,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestTypedefs* castedThis = jsDynamicCast<JSTestTypedefs*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -446,7 +451,7 @@
</span><span class="cx"> }
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto nativeValue = value.toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setStringAttrWithGetterException(WTFMove(nativeValue));
</span><span class="cx"> return true;
</span><span class="lines">@@ -457,7 +462,8 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- UNUSED_PARAM(throwScope); JSValue value = JSValue::decode(encodedValue);
</del><ins>+ UNUSED_PARAM(throwScope);
+ JSValue value = JSValue::decode(encodedValue);
</ins><span class="cx"> UNUSED_PARAM(thisValue);
</span><span class="cx"> JSTestTypedefs* castedThis = jsDynamicCast<JSTestTypedefs*>(JSValue::decode(thisValue));
</span><span class="cx"> if (UNLIKELY(!castedThis)) {
</span><span class="lines">@@ -466,7 +472,7 @@
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> auto nativeValue = value.toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return false;
</span><span class="cx"> impl.setStringAttrWithSetterException(WTFMove(nativeValue), ec);
</span><span class="cx"> setDOMException(state, ec);
</span><span class="lines">@@ -491,7 +497,7 @@
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestTypedefs::info());
</span><span class="cx"> auto& impl = castedThis->wrapped();
</span><span class="cx"> auto x = state->argument(0).isUndefined() ? Vector<int32_t>() : toNativeArray<int32_t>(*state, state->uncheckedArgument(0));
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.func(WTFMove(x));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -511,19 +517,19 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 3))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto width = convert<float>(*state, state->argument(0), ShouldAllowNonFinite::Yes);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto height = convert<float>(*state, state->argument(1), ShouldAllowNonFinite::Yes);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto blur = convert<float>(*state, state->argument(2), ShouldAllowNonFinite::Yes);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto color = state->argument(3).isUndefined() ? String() : state->uncheckedArgument(3).toWTFString(state);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto alpha = state->argument(4).isUndefined() ? Optional<float>() : convert<float>(*state, state->uncheckedArgument(4), ShouldAllowNonFinite::Yes);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.setShadow(WTFMove(width), WTFMove(height), WTFMove(blur), WTFMove(color), WTFMove(alpha));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -543,7 +549,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto sequenceArg = toRefPtrNativeArray<SerializedScriptValue, JSSerializedScriptValue>(*state, state->argument(0));
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> JSValue result = jsNumber(impl.methodWithSequenceArg(WTFMove(sequenceArg)));
</span><span class="cx"> return JSValue::encode(result);
</span><span class="lines">@@ -563,7 +569,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto sequenceArg = toNativeArray<String>(*state, state->argument(0));
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.nullableSequenceArg(WTFMove(sequenceArg));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -583,10 +589,10 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto arg1 = convert<uint64_t>(*state, state->argument(0), Clamp);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> auto arg2 = state->argument(1).isUndefined() ? Optional<uint64_t>() : convert<uint64_t>(*state, state->uncheckedArgument(1), Clamp);
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> impl.funcWithClamp(WTFMove(arg1), WTFMove(arg2));
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -622,7 +628,7 @@
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> auto values = toNativeArray<String>(*state, state->argument(0));
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> JSValue result = jsArray(state, castedThis->globalObject(), impl.stringSequenceFunction(WTFMove(values), ec));
</span><span class="cx">
</span><span class="lines">@@ -645,7 +651,7 @@
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> ExceptionCode ec = 0;
</span><span class="cx"> auto values = toNativeArray<String>(*state, state->argument(0));
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> JSValue result = jsArray(state, castedThis->globalObject(), impl.stringSequenceFunction2(WTFMove(values), ec));
</span><span class="cx">
</span><span class="lines">@@ -667,7 +673,7 @@
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="cx"> return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
</span><span class="cx"> auto sequenceArg = toRefPtrNativeArray<TestEventTarget, JSTestEventTarget>(*state, state->argument(0));
</span><del>- if (UNLIKELY(state->hadException()))
</del><ins>+ if (UNLIKELY(throwScope.exception()))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> JSValue result = jsBoolean(impl.callWithSequenceThatRequiresInclude(WTFMove(sequenceArg)));
</span><span class="cx"> return JSValue::encode(result);
</span></span></pre></div>
<a id="trunkSourceWebCorebridgeNP_jsobjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bridge/NP_jsobject.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bridge/NP_jsobject.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bridge/NP_jsobject.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -177,8 +177,12 @@
</span><span class="cx"> if (!rootObject || !rootObject->isValid())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- ExecState* exec = rootObject->globalObject()->globalExec();
- JSLockHolder lock(exec);
</del><ins>+ auto globalObject = rootObject->globalObject();
+ VM& vm = globalObject->vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
+ ExecState* exec = globalObject->globalExec();
</ins><span class="cx">
</span><span class="cx"> // Call the function object.
</span><span class="cx"> JSValue function = obj->imp;
</span><span class="lines">@@ -193,7 +197,7 @@
</span><span class="cx">
</span><span class="cx"> // Convert and return the result of the function call.
</span><span class="cx"> convertValueToNPVariant(exec, resultV, result);
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -225,8 +229,13 @@
</span><span class="cx"> RootObject* rootObject = obj->rootObject;
</span><span class="cx"> if (!rootObject || !rootObject->isValid())
</span><span class="cx"> return false;
</span><del>- ExecState* exec = rootObject->globalObject()->globalExec();
- JSLockHolder lock(exec);
</del><ins>+
+ auto globalObject = rootObject->globalObject();
+ VM& vm = globalObject->vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
+ ExecState* exec = globalObject->globalExec();
</ins><span class="cx"> JSValue function = obj->imp->get(exec, identifierFromNPIdentifier(exec, i->string()));
</span><span class="cx"> CallData callData;
</span><span class="cx"> CallType callType = getCallData(function, callData);
</span><span class="lines">@@ -240,7 +249,7 @@
</span><span class="cx">
</span><span class="cx"> // Convert and return the result of the function call.
</span><span class="cx"> convertValueToNPVariant(exec, resultV, result);
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -260,14 +269,18 @@
</span><span class="cx"> if (!rootObject || !rootObject->isValid())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- ExecState* exec = rootObject->globalObject()->globalExec();
- JSLockHolder lock(exec);
</del><ins>+ auto globalObject = rootObject->globalObject();
+ VM& vm = globalObject->vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
+ ExecState* exec = globalObject->globalExec();
</ins><span class="cx"> String scriptString = convertNPStringToUTF16(s);
</span><span class="cx">
</span><del>- JSValue returnValue = JSC::evaluate(rootObject->globalObject()->globalExec(), makeSource(scriptString), JSC::JSValue());
</del><ins>+ JSValue returnValue = JSC::evaluate(exec, makeSource(scriptString), JSC::JSValue());
</ins><span class="cx">
</span><span class="cx"> convertValueToNPVariant(exec, returnValue, variant);
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -284,10 +297,14 @@
</span><span class="cx"> if (!rootObject || !rootObject->isValid())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- ExecState* exec = rootObject->globalObject()->globalExec();
</del><ins>+ auto globalObject = rootObject->globalObject();
+ VM& vm = globalObject->vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
+ ExecState* exec = globalObject->globalExec();
</ins><span class="cx"> IdentifierRep* i = static_cast<IdentifierRep*>(propertyName);
</span><span class="cx">
</span><del>- JSLockHolder lock(exec);
</del><span class="cx"> JSValue result;
</span><span class="cx"> if (i->isString())
</span><span class="cx"> result = obj->imp->get(exec, identifierFromNPIdentifier(exec, i->string()));
</span><span class="lines">@@ -295,7 +312,7 @@
</span><span class="cx"> result = obj->imp->get(exec, i->number());
</span><span class="cx">
</span><span class="cx"> convertValueToNPVariant(exec, result, variant);
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -318,8 +335,12 @@
</span><span class="cx"> if (!rootObject || !rootObject->isValid())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- ExecState* exec = rootObject->globalObject()->globalExec();
- JSLockHolder lock(exec);
</del><ins>+ auto globalObject = rootObject->globalObject();
+ VM& vm = globalObject->vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
+ ExecState* exec = globalObject->globalExec();
</ins><span class="cx"> IdentifierRep* i = static_cast<IdentifierRep*>(propertyName);
</span><span class="cx">
</span><span class="cx"> if (i->isString()) {
</span><span class="lines">@@ -327,7 +348,7 @@
</span><span class="cx"> obj->imp->methodTable()->put(obj->imp, exec, identifierFromNPIdentifier(exec, i->string()), convertNPVariantToValue(exec, variant, rootObject), slot);
</span><span class="cx"> } else
</span><span class="cx"> obj->imp->methodTable()->putByIndex(obj->imp, exec, i->number(), convertNPVariantToValue(exec, variant, rootObject), false);
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -346,27 +367,32 @@
</span><span class="cx"> if (!rootObject || !rootObject->isValid())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- ExecState* exec = rootObject->globalObject()->globalExec();
</del><ins>+ auto globalObject = rootObject->globalObject();
+ VM& vm = globalObject->vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
+ ExecState* exec = globalObject->globalExec();
+
</ins><span class="cx"> IdentifierRep* i = static_cast<IdentifierRep*>(propertyName);
</span><span class="cx"> if (i->isString()) {
</span><span class="cx"> if (!obj->imp->hasProperty(exec, identifierFromNPIdentifier(exec, i->string()))) {
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> if (!obj->imp->hasProperty(exec, i->number())) {
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- JSLockHolder lock(exec);
</del><span class="cx"> if (i->isString())
</span><span class="cx"> obj->imp->methodTable()->deleteProperty(obj->imp, exec, identifierFromNPIdentifier(exec, i->string()));
</span><span class="cx"> else
</span><span class="cx"> obj->imp->methodTable()->deletePropertyByIndex(obj->imp, exec, i->number());
</span><span class="cx">
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> return false;
</span><span class="lines">@@ -381,17 +407,21 @@
</span><span class="cx"> if (!rootObject || !rootObject->isValid())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- ExecState* exec = rootObject->globalObject()->globalExec();
</del><ins>+ auto globalObject = rootObject->globalObject();
+ VM& vm = globalObject->vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
+ ExecState* exec = globalObject->globalExec();
</ins><span class="cx"> IdentifierRep* i = static_cast<IdentifierRep*>(propertyName);
</span><del>- JSLockHolder lock(exec);
</del><span class="cx"> if (i->isString()) {
</span><span class="cx"> bool result = obj->imp->hasProperty(exec, identifierFromNPIdentifier(exec, i->string()));
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool result = obj->imp->hasProperty(exec, i->number());
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -414,10 +444,14 @@
</span><span class="cx"> if (!rootObject || !rootObject->isValid())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- ExecState* exec = rootObject->globalObject()->globalExec();
- JSLockHolder lock(exec);
</del><ins>+ auto globalObject = rootObject->globalObject();
+ VM& vm = globalObject->vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
+ ExecState* exec = globalObject->globalExec();
</ins><span class="cx"> JSValue func = obj->imp->get(exec, identifierFromNPIdentifier(exec, i->string()));
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> return !func.isUndefined();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -443,8 +477,12 @@
</span><span class="cx"> if (!rootObject || !rootObject->isValid())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- ExecState* exec = rootObject->globalObject()->globalExec();
- JSLockHolder lock(exec);
</del><ins>+ auto globalObject = rootObject->globalObject();
+ VM& vm = globalObject->vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
+ ExecState* exec = globalObject->globalExec();
</ins><span class="cx"> PropertyNameArray propertyNames(exec, PropertyNameMode::Strings);
</span><span class="cx">
</span><span class="cx"> obj->imp->methodTable()->getPropertyNames(obj->imp, exec, propertyNames, EnumerationMode());
</span><span class="lines">@@ -458,7 +496,7 @@
</span><span class="cx"> *identifier = identifiers;
</span><span class="cx"> *count = size;
</span><span class="cx">
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -479,10 +517,14 @@
</span><span class="cx"> RootObject* rootObject = obj->rootObject;
</span><span class="cx"> if (!rootObject || !rootObject->isValid())
</span><span class="cx"> return false;
</span><ins>+
+ auto globalObject = rootObject->globalObject();
+ VM& vm = globalObject->vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
+ ExecState* exec = globalObject->globalExec();
</ins><span class="cx">
</span><del>- ExecState* exec = rootObject->globalObject()->globalExec();
- JSLockHolder lock(exec);
-
</del><span class="cx"> // Call the constructor object.
</span><span class="cx"> JSValue constructor = obj->imp;
</span><span class="cx"> ConstructData constructData;
</span><span class="lines">@@ -496,7 +538,7 @@
</span><span class="cx">
</span><span class="cx"> // Convert and return the result.
</span><span class="cx"> convertValueToNPVariant(exec, resultV, result);
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebridgecc_instancecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bridge/c/c_instance.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bridge/c/c_instance.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bridge/c/c_instance.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -68,14 +68,13 @@
</span><span class="cx">
</span><span class="cx"> void CInstance::moveGlobalExceptionToExecState(ExecState* exec)
</span><span class="cx"> {
</span><del>- VM& vm = exec->vm();
- auto scope = DECLARE_THROW_SCOPE(vm);
-
</del><span class="cx"> if (globalExceptionString().isNull())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> {
</span><del>- JSLockHolder lock(exec);
</del><ins>+ VM& vm = exec->vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> throwException(exec, scope, createError(exec, globalExceptionString()));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebridgeobjcWebScriptObjectmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bridge/objc/WebScriptObject.mm (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bridge/objc/WebScriptObject.mm 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/bridge/objc/WebScriptObject.mm 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> #import <JavaScriptCore/JSContextInternal.h>
</span><span class="cx"> #import <JavaScriptCore/JSValueInternal.h>
</span><span class="cx"> #import <interpreter/CallFrame.h>
</span><ins>+#import <runtime/CatchScope.h>
</ins><span class="cx"> #import <runtime/Completion.h>
</span><span class="cx"> #import <runtime/InitializeThreading.h>
</span><span class="cx"> #import <runtime/JSGlobalObject.h>
</span><span class="lines">@@ -129,8 +130,10 @@
</span><span class="cx">
</span><span class="cx"> static void addExceptionToConsole(ExecState* exec)
</span><span class="cx"> {
</span><del>- JSC::Exception* exception = exec->exception();
- exec->clearException();
</del><ins>+ JSC::VM& vm = exec->vm();
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+ JSC::Exception* exception = scope.exception();
+ scope.clearException();
</ins><span class="cx"> addExceptionToConsole(exec, exception);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -334,9 +337,12 @@
</span><span class="cx"> return nil;
</span><span class="cx">
</span><span class="cx"> // Look up the function object.
</span><del>- ExecState* exec = [self _rootObject]->globalObject()->globalExec();
- JSLockHolder lock(exec);
- ASSERT(!exec->hadException());
</del><ins>+ auto globalObject = [self _rootObject]->globalObject();
+ auto& vm = globalObject->vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+ ExecState* exec = globalObject->globalExec();
+ UNUSED_PARAM(scope);
</ins><span class="cx">
</span><span class="cx"> JSC::JSValue function = [self _imp]->get(exec, Identifier::fromString(exec, String(name)));
</span><span class="cx"> CallData callData;
</span><span class="lines">@@ -369,10 +375,12 @@
</span><span class="cx"> if (![self _isSafeScript])
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- ExecState* exec = [self _rootObject]->globalObject()->globalExec();
- ASSERT(!exec->hadException());
-
- JSLockHolder lock(exec);
</del><ins>+ auto globalObject = [self _rootObject]->globalObject();
+ auto& vm = globalObject->vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+ ExecState* exec = globalObject->globalExec();
+ UNUSED_PARAM(scope);
</ins><span class="cx">
</span><span class="cx"> JSC::JSValue returnValue = JSMainThreadExecState::profiledEvaluate(exec, JSC::ProfilingReason::Other, makeSource(String(script)), JSC::JSValue());
</span><span class="cx">
</span><span class="lines">@@ -386,17 +394,19 @@
</span><span class="cx"> if (![self _isSafeScript])
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ExecState* exec = [self _rootObject]->globalObject()->globalExec();
- ASSERT(!exec->hadException());
</del><ins>+ auto globalObject = [self _rootObject]->globalObject();
+ auto& vm = globalObject->vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+ ExecState* exec = globalObject->globalExec();
</ins><span class="cx">
</span><del>- JSLockHolder lock(exec);
</del><span class="cx"> JSObject* object = JSC::jsDynamicCast<JSObject*>([self _imp]);
</span><span class="cx"> PutPropertySlot slot(object);
</span><span class="cx"> object->methodTable()->put(object, exec, Identifier::fromString(exec, String(key)), convertObjcValueToValue(exec, &value, ObjcObjectType, [self _rootObject]), slot);
</span><span class="cx">
</span><del>- if (exec->hadException()) {
</del><ins>+ if (UNLIKELY(scope.exception())) {
</ins><span class="cx"> addExceptionToConsole(exec);
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -405,22 +415,25 @@
</span><span class="cx"> if (![self _isSafeScript])
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- ExecState* exec = [self _rootObject]->globalObject()->globalExec();
- ASSERT(!exec->hadException());
-
</del><span class="cx"> id resultObj;
</span><span class="cx"> {
</span><ins>+ auto globalObject = [self _rootObject]->globalObject();
+ auto& vm = globalObject->vm();
+
</ins><span class="cx"> // Need to scope this lock to ensure that we release the lock before calling
</span><span class="cx"> // [super valueForKey:key] which might throw an exception and bypass the JSLock destructor,
</span><span class="cx"> // leaving the lock permanently held
</span><del>- JSLockHolder lock(exec);
-
</del><ins>+ JSLockHolder lock(vm);
+
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+ ExecState* exec = globalObject->globalExec();
+
</ins><span class="cx"> JSC::JSValue result = [self _imp]->get(exec, Identifier::fromString(exec, String(key)));
</span><span class="cx">
</span><del>- if (exec->hadException()) {
</del><ins>+ if (UNLIKELY(scope.exception())) {
</ins><span class="cx"> addExceptionToConsole(exec);
</span><span class="cx"> result = jsUndefined();
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> resultObj = [WebScriptObject _convertValueToObjcValue:result originRootObject:[self _originRootObject] rootObject:[self _rootObject]];
</span><span class="lines">@@ -437,15 +450,17 @@
</span><span class="cx"> if (![self _isSafeScript])
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ExecState* exec = [self _rootObject]->globalObject()->globalExec();
- ASSERT(!exec->hadException());
</del><ins>+ auto globalObject = [self _rootObject]->globalObject();
+ auto& vm = globalObject->vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+ ExecState* exec = globalObject->globalExec();
</ins><span class="cx">
</span><del>- JSLockHolder lock(exec);
</del><span class="cx"> [self _imp]->methodTable()->deleteProperty([self _imp], exec, Identifier::fromString(exec, String(key)));
</span><span class="cx">
</span><del>- if (exec->hadException()) {
</del><ins>+ if (UNLIKELY(scope.exception())) {
</ins><span class="cx"> addExceptionToConsole(exec);
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -454,15 +469,17 @@
</span><span class="cx"> if (![self _isSafeScript])
</span><span class="cx"> return NO;
</span><span class="cx">
</span><del>- ExecState* exec = [self _rootObject]->globalObject()->globalExec();
- ASSERT(!exec->hadException());
</del><ins>+ auto globalObject = [self _rootObject]->globalObject();
+ auto& vm = globalObject->vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+ ExecState* exec = globalObject->globalExec();
</ins><span class="cx">
</span><del>- JSLockHolder lock(exec);
</del><span class="cx"> BOOL result = [self _imp]->hasProperty(exec, Identifier::fromString(exec, String(key)));
</span><span class="cx">
</span><del>- if (exec->hadException()) {
</del><ins>+ if (UNLIKELY(scope.exception())) {
</ins><span class="cx"> addExceptionToConsole(exec);
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return result;
</span><span class="lines">@@ -490,16 +507,18 @@
</span><span class="cx"> if (![self _isSafeScript])
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- ExecState* exec = [self _rootObject]->globalObject()->globalExec();
- ASSERT(!exec->hadException());
</del><ins>+ auto globalObject = [self _rootObject]->globalObject();
+ auto& vm = globalObject->vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+ ExecState* exec = globalObject->globalExec();
</ins><span class="cx">
</span><del>- JSLockHolder lock(exec);
</del><span class="cx"> JSC::JSValue result = [self _imp]->get(exec, index);
</span><span class="cx">
</span><del>- if (exec->hadException()) {
</del><ins>+ if (UNLIKELY(scope.exception())) {
</ins><span class="cx"> addExceptionToConsole(exec);
</span><span class="cx"> result = jsUndefined();
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> id resultObj = [WebScriptObject _convertValueToObjcValue:result originRootObject:[self _originRootObject] rootObject:[self _rootObject]];
</span><span class="lines">@@ -512,15 +531,17 @@
</span><span class="cx"> if (![self _isSafeScript])
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ExecState* exec = [self _rootObject]->globalObject()->globalExec();
- ASSERT(!exec->hadException());
</del><ins>+ auto globalObject = [self _rootObject]->globalObject();
+ auto& vm = globalObject->vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+ ExecState* exec = globalObject->globalExec();
</ins><span class="cx">
</span><del>- JSLockHolder lock(exec);
</del><span class="cx"> [self _imp]->methodTable()->putByIndex([self _imp], exec, index, convertObjcValueToValue(exec, &value, ObjcObjectType, [self _rootObject]), false);
</span><span class="cx">
</span><del>- if (exec->hadException()) {
</del><ins>+ if (UNLIKELY(scope.exception())) {
</ins><span class="cx"> addExceptionToConsole(exec);
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsContentExtensionParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/ContentExtensionParser.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/ContentExtensionParser.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionParser.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -60,6 +60,9 @@
</span><span class="cx">
</span><span class="cx"> static std::error_code getDomainList(ExecState& exec, const JSObject* arrayObject, Vector<String>& vector)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> ASSERT(vector.isEmpty());
</span><span class="cx"> if (!arrayObject || !isJSArray(arrayObject))
</span><span class="cx"> return ContentExtensionError::JSONInvalidDomainList;
</span><span class="lines">@@ -68,7 +71,7 @@
</span><span class="cx"> unsigned length = array->length();
</span><span class="cx"> for (unsigned i = 0; i < length; ++i) {
</span><span class="cx"> const JSValue value = array->getIndex(&exec, i);
</span><del>- if (exec.hadException() || !value.isString())
</del><ins>+ if (scope.exception() || !value.isString())
</ins><span class="cx"> return ContentExtensionError::JSONInvalidDomainList;
</span><span class="cx">
</span><span class="cx"> // Domains should be punycode encoded lower case.
</span><span class="lines">@@ -84,11 +87,14 @@
</span><span class="cx">
</span><span class="cx"> static std::error_code getTypeFlags(ExecState& exec, const JSValue& typeValue, ResourceFlags& flags, uint16_t (*stringToType)(const String&))
</span><span class="cx"> {
</span><ins>+ VM& vm = exec.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> if (!typeValue.isObject())
</span><span class="cx"> return { };
</span><span class="cx">
</span><span class="cx"> const JSObject* object = typeValue.toObject(&exec);
</span><del>- ASSERT(!exec.hadException());
</del><ins>+ ASSERT(!scope.exception());
</ins><span class="cx"> if (!isJSArray(object))
</span><span class="cx"> return ContentExtensionError::JSONInvalidTriggerFlagsArray;
</span><span class="cx">
</span><span class="lines">@@ -97,7 +103,7 @@
</span><span class="cx"> unsigned length = array->length();
</span><span class="cx"> for (unsigned i = 0; i < length; ++i) {
</span><span class="cx"> const JSValue value = array->getIndex(&exec, i);
</span><del>- if (exec.hadException() || !value)
</del><ins>+ if (scope.exception() || !value)
</ins><span class="cx"> return ContentExtensionError::JSONInvalidObjectInTriggerFlagsArray;
</span><span class="cx">
</span><span class="cx"> String name = value.toWTFString(&exec);
</span><span class="lines">@@ -113,12 +119,15 @@
</span><span class="cx">
</span><span class="cx"> static std::error_code loadTrigger(ExecState& exec, const JSObject& ruleObject, Trigger& trigger)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> const JSValue triggerObject = ruleObject.get(&exec, Identifier::fromString(&exec, "trigger"));
</span><del>- if (!triggerObject || exec.hadException() || !triggerObject.isObject())
</del><ins>+ if (!triggerObject || scope.exception() || !triggerObject.isObject())
</ins><span class="cx"> return ContentExtensionError::JSONInvalidTrigger;
</span><span class="cx">
</span><span class="cx"> const JSValue urlFilterObject = triggerObject.get(&exec, Identifier::fromString(&exec, "url-filter"));
</span><del>- if (!urlFilterObject || exec.hadException() || !urlFilterObject.isString())
</del><ins>+ if (!urlFilterObject || scope.exception() || !urlFilterObject.isString())
</ins><span class="cx"> return ContentExtensionError::JSONInvalidURLFilterInTrigger;
</span><span class="cx">
</span><span class="cx"> String urlFilter = urlFilterObject.toWTFString(&exec);
</span><span class="lines">@@ -128,11 +137,11 @@
</span><span class="cx"> trigger.urlFilter = urlFilter;
</span><span class="cx">
</span><span class="cx"> const JSValue urlFilterCaseValue = triggerObject.get(&exec, Identifier::fromString(&exec, "url-filter-is-case-sensitive"));
</span><del>- if (urlFilterCaseValue && !exec.hadException() && urlFilterCaseValue.isBoolean())
</del><ins>+ if (urlFilterCaseValue && !scope.exception() && urlFilterCaseValue.isBoolean())
</ins><span class="cx"> trigger.urlFilterIsCaseSensitive = urlFilterCaseValue.toBoolean(&exec);
</span><span class="cx">
</span><span class="cx"> const JSValue resourceTypeValue = triggerObject.get(&exec, Identifier::fromString(&exec, "resource-type"));
</span><del>- if (!exec.hadException() && resourceTypeValue.isObject()) {
</del><ins>+ if (!scope.exception() && resourceTypeValue.isObject()) {
</ins><span class="cx"> auto typeFlagsError = getTypeFlags(exec, resourceTypeValue, trigger.flags, readResourceType);
</span><span class="cx"> if (typeFlagsError)
</span><span class="cx"> return typeFlagsError;
</span><span class="lines">@@ -140,7 +149,7 @@
</span><span class="cx"> return ContentExtensionError::JSONInvalidTriggerFlagsArray;
</span><span class="cx">
</span><span class="cx"> const JSValue loadTypeValue = triggerObject.get(&exec, Identifier::fromString(&exec, "load-type"));
</span><del>- if (!exec.hadException() && loadTypeValue.isObject()) {
</del><ins>+ if (!scope.exception() && loadTypeValue.isObject()) {
</ins><span class="cx"> auto typeFlagsError = getTypeFlags(exec, loadTypeValue, trigger.flags, readLoadType);
</span><span class="cx"> if (typeFlagsError)
</span><span class="cx"> return typeFlagsError;
</span><span class="lines">@@ -148,7 +157,7 @@
</span><span class="cx"> return ContentExtensionError::JSONInvalidTriggerFlagsArray;
</span><span class="cx">
</span><span class="cx"> const JSValue ifDomain = triggerObject.get(&exec, Identifier::fromString(&exec, "if-domain"));
</span><del>- if (!exec.hadException() && ifDomain.isObject()) {
</del><ins>+ if (!scope.exception() && ifDomain.isObject()) {
</ins><span class="cx"> auto ifDomainError = getDomainList(exec, asObject(ifDomain), trigger.domains);
</span><span class="cx"> if (ifDomainError)
</span><span class="cx"> return ifDomainError;
</span><span class="lines">@@ -160,7 +169,7 @@
</span><span class="cx"> return ContentExtensionError::JSONInvalidDomainList;
</span><span class="cx">
</span><span class="cx"> const JSValue unlessDomain = triggerObject.get(&exec, Identifier::fromString(&exec, "unless-domain"));
</span><del>- if (!exec.hadException() && unlessDomain.isObject()) {
</del><ins>+ if (!scope.exception() && unlessDomain.isObject()) {
</ins><span class="cx"> if (trigger.domainCondition != Trigger::DomainCondition::None)
</span><span class="cx"> return ContentExtensionError::JSONUnlessAndIfDomain;
</span><span class="cx"> auto unlessDomainError = getDomainList(exec, asObject(unlessDomain), trigger.domains);
</span><span class="lines">@@ -186,13 +195,16 @@
</span><span class="cx">
</span><span class="cx"> static std::error_code loadAction(ExecState& exec, const JSObject& ruleObject, Action& action, bool& validSelector)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> validSelector = true;
</span><span class="cx"> const JSValue actionObject = ruleObject.get(&exec, Identifier::fromString(&exec, "action"));
</span><del>- if (!actionObject || exec.hadException() || !actionObject.isObject())
</del><ins>+ if (!actionObject || scope.exception() || !actionObject.isObject())
</ins><span class="cx"> return ContentExtensionError::JSONInvalidAction;
</span><span class="cx">
</span><span class="cx"> const JSValue typeObject = actionObject.get(&exec, Identifier::fromString(&exec, "type"));
</span><del>- if (!typeObject || exec.hadException() || !typeObject.isString())
</del><ins>+ if (!typeObject || scope.exception() || !typeObject.isString())
</ins><span class="cx"> return ContentExtensionError::JSONInvalidActionType;
</span><span class="cx">
</span><span class="cx"> String actionType = typeObject.toWTFString(&exec);
</span><span class="lines">@@ -205,7 +217,7 @@
</span><span class="cx"> action = ActionType::BlockCookies;
</span><span class="cx"> else if (actionType == "css-display-none") {
</span><span class="cx"> JSValue selector = actionObject.get(&exec, Identifier::fromString(&exec, "selector"));
</span><del>- if (!selector || exec.hadException() || !selector.isString())
</del><ins>+ if (!selector || scope.exception() || !selector.isString())
</ins><span class="cx"> return ContentExtensionError::JSONInvalidCSSDisplayNoneActionType;
</span><span class="cx">
</span><span class="cx"> String s = selector.toWTFString(&exec);
</span><span class="lines">@@ -243,10 +255,13 @@
</span><span class="cx">
</span><span class="cx"> static std::error_code loadEncodedRules(ExecState& exec, const String& rules, Vector<ContentExtensionRule>& ruleList)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> // FIXME: JSONParse should require callbacks instead of an ExecState.
</span><span class="cx"> const JSValue decodedRules = JSONParse(&exec, rules);
</span><span class="cx">
</span><del>- if (exec.hadException() || !decodedRules)
</del><ins>+ if (scope.exception() || !decodedRules)
</ins><span class="cx"> return ContentExtensionError::JSONInvalid;
</span><span class="cx">
</span><span class="cx"> if (!decodedRules.isObject())
</span><span class="lines">@@ -253,7 +268,7 @@
</span><span class="cx"> return ContentExtensionError::JSONTopLevelStructureNotAnObject;
</span><span class="cx">
</span><span class="cx"> const JSObject* topLevelObject = decodedRules.toObject(&exec);
</span><del>- if (!topLevelObject || exec.hadException())
</del><ins>+ if (!topLevelObject || scope.exception())
</ins><span class="cx"> return ContentExtensionError::JSONTopLevelStructureNotAnObject;
</span><span class="cx">
</span><span class="cx"> if (!isJSArray(topLevelObject))
</span><span class="lines">@@ -269,11 +284,11 @@
</span><span class="cx"> return ContentExtensionError::JSONTooManyRules;
</span><span class="cx"> for (unsigned i = 0; i < length; ++i) {
</span><span class="cx"> const JSValue value = topLevelArray->getIndex(&exec, i);
</span><del>- if (exec.hadException() || !value)
</del><ins>+ if (scope.exception() || !value)
</ins><span class="cx"> return ContentExtensionError::JSONInvalidObjectInTopLevelArray;
</span><span class="cx">
</span><span class="cx"> const JSObject* ruleObject = value.toObject(&exec);
</span><del>- if (!ruleObject || exec.hadException())
</del><ins>+ if (!ruleObject || scope.exception())
</ins><span class="cx"> return ContentExtensionError::JSONInvalidRule;
</span><span class="cx">
</span><span class="cx"> auto error = loadRule(exec, *ruleObject, localRuleList);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -4002,6 +4002,8 @@
</span><span class="cx">
</span><span class="cx"> static JSC::JSValue controllerJSValue(JSC::ExecState& exec, JSDOMGlobalObject& globalObject, HTMLMediaElement& media)
</span><span class="cx"> {
</span><ins>+ JSC::VM& vm = globalObject.vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> auto mediaJSWrapper = toJS(&exec, &globalObject, media);
</span><span class="cx">
</span><span class="cx"> // Retrieve the controller through the JS object graph
</span><span class="lines">@@ -4009,9 +4011,9 @@
</span><span class="cx"> if (!mediaJSWrapperObject)
</span><span class="cx"> return JSC::jsNull();
</span><span class="cx">
</span><del>- JSC::Identifier controlsHost = JSC::Identifier::fromString(&exec.vm(), "controlsHost");
</del><ins>+ JSC::Identifier controlsHost = JSC::Identifier::fromString(&vm, "controlsHost");
</ins><span class="cx"> JSC::JSValue controlsHostJSWrapper = mediaJSWrapperObject->get(&exec, controlsHost);
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSC::jsNull();
</span><span class="cx">
</span><span class="cx"> JSC::JSObject* controlsHostJSWrapperObject = JSC::jsDynamicCast<JSC::JSObject*>(controlsHostJSWrapper);
</span><span class="lines">@@ -4018,9 +4020,9 @@
</span><span class="cx"> if (!controlsHostJSWrapperObject)
</span><span class="cx"> return JSC::jsNull();
</span><span class="cx">
</span><del>- JSC::Identifier controllerID = JSC::Identifier::fromString(&exec.vm(), "controller");
</del><ins>+ JSC::Identifier controllerID = JSC::Identifier::fromString(&vm, "controller");
</ins><span class="cx"> JSC::JSValue controllerJSWrapper = controlsHostJSWrapperObject->get(&exec, controllerID);
</span><del>- if (exec.hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return JSC::jsNull();
</span><span class="cx">
</span><span class="cx"> return controllerJSWrapper;
</span><span class="lines">@@ -4057,8 +4059,10 @@
</span><span class="cx">
</span><span class="cx"> ScriptController& scriptController = document().frame()->script();
</span><span class="cx"> JSDOMGlobalObject* globalObject = JSC::jsCast<JSDOMGlobalObject*>(scriptController.globalObject(world));
</span><ins>+ JSC::VM& vm = globalObject->vm();
+ JSC::JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
</ins><span class="cx"> JSC::ExecState* exec = globalObject->globalExec();
</span><del>- JSC::JSLockHolder lock(exec);
</del><span class="cx">
</span><span class="cx"> JSC::JSValue controllerValue = controllerJSValue(*exec, *globalObject, *this);
</span><span class="cx"> JSC::JSObject* controllerObject = JSC::jsDynamicCast<JSC::JSObject*>(controllerValue);
</span><span class="lines">@@ -4083,7 +4087,7 @@
</span><span class="cx">
</span><span class="cx"> JSC::MarkedArgumentBuffer noArguments;
</span><span class="cx"> JSC::call(exec, methodObject, callType, callData, controllerObject, noArguments);
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx">
</span><span class="cx"> m_haveSetUpCaptionContainer = true;
</span><span class="cx"> #endif
</span><span class="lines">@@ -6603,8 +6607,10 @@
</span><span class="cx"> DOMWrapperWorld& world = ensureIsolatedWorld();
</span><span class="cx"> ScriptController& scriptController = document().frame()->script();
</span><span class="cx"> JSDOMGlobalObject* globalObject = JSC::jsCast<JSDOMGlobalObject*>(scriptController.globalObject(world));
</span><ins>+ JSC::VM& vm = globalObject->vm();
+ JSC::JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
</ins><span class="cx"> JSC::ExecState* exec = globalObject->globalExec();
</span><del>- JSC::JSLockHolder lock(exec);
</del><span class="cx">
</span><span class="cx"> JSC::JSValue functionValue = globalObject->get(exec, JSC::Identifier::fromString(exec, "createControls"));
</span><span class="cx"> if (functionValue.isFunction())
</span><span class="lines">@@ -6617,8 +6623,8 @@
</span><span class="cx"> URL scriptURL;
</span><span class="cx"> #endif
</span><span class="cx"> scriptController.evaluateInWorld(ScriptSourceCode(mediaControlsScript, scriptURL), world);
</span><del>- if (exec->hadException()) {
- exec->clearException();
</del><ins>+ if (UNLIKELY(scope.exception())) {
+ scope.clearException();
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -6676,8 +6682,10 @@
</span><span class="cx">
</span><span class="cx"> ScriptController& scriptController = document().frame()->script();
</span><span class="cx"> JSDOMGlobalObject* globalObject = JSC::jsCast<JSDOMGlobalObject*>(scriptController.globalObject(world));
</span><ins>+ JSC::VM& vm = globalObject->vm();
+ JSC::JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
</ins><span class="cx"> JSC::ExecState* exec = globalObject->globalExec();
</span><del>- JSC::JSLockHolder lock(exec);
</del><span class="cx">
</span><span class="cx"> // The media controls script must provide a method with the following details.
</span><span class="cx"> // Name: createControls
</span><span class="lines">@@ -6704,7 +6712,7 @@
</span><span class="cx"> argList.append(mediaControlsHostJSWrapper);
</span><span class="cx">
</span><span class="cx"> JSC::JSObject* function = functionValue.toObject(exec);
</span><del>- ASSERT(!exec->hadException());
</del><ins>+ ASSERT(!scope.exception());
</ins><span class="cx"> JSC::CallData callData;
</span><span class="cx"> JSC::CallType callType = function->methodTable()->getCallData(function, callData);
</span><span class="cx"> if (callType == JSC::CallType::None)
</span><span class="lines">@@ -6711,7 +6719,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> JSC::JSValue controllerValue = JSC::call(exec, function, callType, callData, globalObject, argList);
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> JSC::JSObject* controllerObject = JSC::jsDynamicCast<JSC::JSObject*>(controllerValue);
</span><span class="cx"> if (!controllerObject)
</span><span class="cx"> return;
</span><span class="lines">@@ -6718,7 +6726,7 @@
</span><span class="cx">
</span><span class="cx"> // Connect the Media, MediaControllerHost, and Controller so the GC knows about their relationship
</span><span class="cx"> JSC::JSObject* mediaJSWrapperObject = mediaJSWrapper.toObject(exec);
</span><del>- ASSERT(!exec->hadException());
</del><ins>+ ASSERT(!scope.exception());
</ins><span class="cx"> JSC::Identifier controlsHost = JSC::Identifier::fromString(&exec->vm(), "controlsHost");
</span><span class="cx">
</span><span class="cx"> ASSERT(!mediaJSWrapperObject->hasProperty(exec, controlsHost));
</span><span class="lines">@@ -6738,8 +6746,8 @@
</span><span class="cx"> updatePageScaleFactorJSProperty();
</span><span class="cx"> updateUsesLTRUserInterfaceLayoutDirectionJSProperty();
</span><span class="cx">
</span><del>- if (exec->hadException())
- exec->clearException();
</del><ins>+ if (UNLIKELY(scope.exception()))
+ scope.clearException();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLMediaElement::setMediaControlsDependOnPageScaleFactor(bool dependsOnPageScale)
</span><span class="lines">@@ -6774,21 +6782,23 @@
</span><span class="cx"> DOMWrapperWorld& world = ensureIsolatedWorld();
</span><span class="cx"> ScriptController& scriptController = document().frame()->script();
</span><span class="cx"> JSDOMGlobalObject* globalObject = JSC::jsCast<JSDOMGlobalObject*>(scriptController.globalObject(world));
</span><ins>+ JSC::VM& vm = globalObject->vm();
+ JSC::JSLockHolder lock(vm);
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSC::ExecState* exec = globalObject->globalExec();
</span><del>- JSC::JSLockHolder lock(exec);
</del><span class="cx">
</span><span class="cx"> JSC::JSValue controllerValue = controllerJSValue(*exec, *globalObject, *this);
</span><span class="cx"> JSC::JSObject* controllerObject = controllerValue.toObject(exec);
</span><span class="cx">
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> JSC::JSValue functionValue = controllerObject->get(exec, JSC::Identifier::fromString(exec, "handlePresentationModeChange"));
</span><del>- if (exec->hadException() || functionValue.isUndefinedOrNull())
</del><ins>+ if (UNLIKELY(scope.exception()) || functionValue.isUndefinedOrNull())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> JSC::JSObject* function = functionValue.toObject(exec);
</span><del>- ASSERT(!exec->hadException());
</del><ins>+ ASSERT(!scope.exception());
</ins><span class="cx"> JSC::CallData callData;
</span><span class="cx"> JSC::CallType callType = function->methodTable()->getCallData(function, callData);
</span><span class="cx"> if (callType == JSC::CallType::None)
</span><span class="lines">@@ -6815,21 +6825,23 @@
</span><span class="cx">
</span><span class="cx"> ScriptController& scriptController = document().frame()->script();
</span><span class="cx"> JSDOMGlobalObject* globalObject = JSC::jsCast<JSDOMGlobalObject*>(scriptController.globalObject(world));
</span><ins>+ JSC::VM& vm = globalObject->vm();
+ JSC::JSLockHolder lock(vm);
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx"> JSC::ExecState* exec = globalObject->globalExec();
</span><del>- JSC::JSLockHolder lock(exec);
</del><span class="cx">
</span><span class="cx"> JSC::JSValue controllerValue = controllerJSValue(*exec, *globalObject, *this);
</span><span class="cx"> JSC::JSObject* controllerObject = controllerValue.toObject(exec);
</span><span class="cx">
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return emptyString();
</span><span class="cx">
</span><span class="cx"> JSC::JSValue functionValue = controllerObject->get(exec, JSC::Identifier::fromString(exec, "getCurrentControlsStatus"));
</span><del>- if (exec->hadException() || functionValue.isUndefinedOrNull())
</del><ins>+ if (UNLIKELY(scope.exception()) || functionValue.isUndefinedOrNull())
</ins><span class="cx"> return emptyString();
</span><span class="cx">
</span><span class="cx"> JSC::JSObject* function = functionValue.toObject(exec);
</span><del>- ASSERT(!exec->hadException());
</del><ins>+ ASSERT(!scope.exception());
</ins><span class="cx"> JSC::CallData callData;
</span><span class="cx"> JSC::CallType callType = function->methodTable()->getCallData(function, callData);
</span><span class="cx"> JSC::MarkedArgumentBuffer argList;
</span><span class="lines">@@ -6838,7 +6850,7 @@
</span><span class="cx">
</span><span class="cx"> JSC::JSValue outputValue = JSC::call(exec, function, callType, callData, controllerObject, argList);
</span><span class="cx">
</span><del>- if (exec->hadException())
</del><ins>+ if (UNLIKELY(scope.exception()))
</ins><span class="cx"> return emptyString();
</span><span class="cx">
</span><span class="cx"> return outputValue.getString(exec);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLPlugInImageElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -392,10 +392,12 @@
</span><span class="cx">
</span><span class="cx"> ScriptController& scriptController = document().frame()->script();
</span><span class="cx"> JSDOMGlobalObject* globalObject = JSC::jsCast<JSDOMGlobalObject*>(scriptController.globalObject(isolatedWorld));
</span><ins>+
+ JSC::VM& vm = globalObject->vm();
+ JSC::JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
</ins><span class="cx"> JSC::ExecState* exec = globalObject->globalExec();
</span><span class="cx">
</span><del>- JSC::JSLockHolder lock(exec);
-
</del><span class="cx"> JSC::MarkedArgumentBuffer argList;
</span><span class="cx"> argList.append(toJS(exec, globalObject, root));
</span><span class="cx"> argList.append(jsString(exec, titleText(page, mimeType)));
</span><span class="lines">@@ -408,8 +410,8 @@
</span><span class="cx"> // It is expected the JS file provides a createOverlay(shadowRoot, title, subtitle) function.
</span><span class="cx"> JSC::JSObject* overlay = globalObject->get(exec, JSC::Identifier::fromString(exec, "createOverlay")).toObject(exec);
</span><span class="cx"> if (!overlay) {
</span><del>- ASSERT(exec->hadException());
- exec->clearException();
</del><ins>+ ASSERT(scope.exception());
+ scope.clearException();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> JSC::CallData callData;
</span><span class="lines">@@ -418,7 +420,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> JSC::call(exec, overlay, callType, callData, globalObject, argList);
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool HTMLPlugInImageElement::partOfSnapshotOverlay(const Node* node) const
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-09-07 Mark Lam <mark.lam@apple.com>
+
+ Add CatchScope and force all exception checks to be via ThrowScope or CatchScope.
+ https://bugs.webkit.org/show_bug.cgi?id=161498
+
+ Reviewed by Geoffrey Garen.
+
+ * Plugins/Hosted/NetscapePluginInstanceProxy.mm:
+ (WebKit::NetscapePluginInstanceProxy::evaluate):
+ (WebKit::NetscapePluginInstanceProxy::invoke):
+ (WebKit::NetscapePluginInstanceProxy::invokeDefault):
+ (WebKit::NetscapePluginInstanceProxy::construct):
+ (WebKit::NetscapePluginInstanceProxy::getProperty):
+ (WebKit::NetscapePluginInstanceProxy::setProperty):
+ (WebKit::NetscapePluginInstanceProxy::removeProperty):
+ (WebKit::NetscapePluginInstanceProxy::hasProperty):
+ (WebKit::NetscapePluginInstanceProxy::hasMethod):
+ (WebKit::NetscapePluginInstanceProxy::enumerate):
+ * WebView/WebView.mm:
+ (aeDescFromJSValue):
+
</ins><span class="cx"> 2016-09-07 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> [Streams API] Separate compile flag for ReadableStream and WritableStream
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsHostedNetscapePluginInstanceProxymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -885,8 +885,11 @@
</span><span class="cx"> if (!frame)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- JSLockHolder lock(pluginWorld().vm());
- Strong<JSGlobalObject> globalObject(pluginWorld().vm(), frame->script().globalObject(pluginWorld()));
</del><ins>+ VM& vm = pluginWorld().vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
+ Strong<JSGlobalObject> globalObject(vm, frame->script().globalObject(pluginWorld()));
</ins><span class="cx"> ExecState* exec = globalObject->globalExec();
</span><span class="cx">
</span><span class="cx"> UserGestureIndicator gestureIndicator(allowPopups ? Optional<ProcessingUserGestureState>(ProcessingUserGesture) : Nullopt);
</span><span class="lines">@@ -894,7 +897,7 @@
</span><span class="cx"> JSValue result = JSC::evaluate(exec, makeSource(script));
</span><span class="cx">
</span><span class="cx"> marshalValue(exec, result, resultData, resultLength);
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -915,9 +918,12 @@
</span><span class="cx"> Frame* frame = core([m_pluginView webFrame]);
</span><span class="cx"> if (!frame)
</span><span class="cx"> return false;
</span><del>-
</del><ins>+
+ VM& vm = pluginWorld().vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
</ins><span class="cx"> ExecState* exec = frame->script().globalObject(pluginWorld())->globalExec();
</span><del>- JSLockHolder lock(exec);
</del><span class="cx"> JSValue function = object->get(exec, methodName);
</span><span class="cx"> CallData callData;
</span><span class="cx"> CallType callType = getCallData(function, callData);
</span><span class="lines">@@ -930,7 +936,7 @@
</span><span class="cx"> JSValue value = call(exec, function, callType, callData, object, argList);
</span><span class="cx">
</span><span class="cx"> marshalValue(exec, value, resultData, resultLength);
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -948,9 +954,12 @@
</span><span class="cx"> Frame* frame = core([m_pluginView webFrame]);
</span><span class="cx"> if (!frame)
</span><span class="cx"> return false;
</span><del>-
</del><ins>+
+ VM& vm = pluginWorld().vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
</ins><span class="cx"> ExecState* exec = frame->script().globalObject(pluginWorld())->globalExec();
</span><del>- JSLockHolder lock(exec);
</del><span class="cx"> CallData callData;
</span><span class="cx"> CallType callType = object->methodTable()->getCallData(object, callData);
</span><span class="cx"> if (callType == CallType::None)
</span><span class="lines">@@ -962,7 +971,7 @@
</span><span class="cx"> JSValue value = call(exec, object, callType, callData, object, argList);
</span><span class="cx">
</span><span class="cx"> marshalValue(exec, value, resultData, resultLength);
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -980,9 +989,12 @@
</span><span class="cx"> Frame* frame = core([m_pluginView webFrame]);
</span><span class="cx"> if (!frame)
</span><span class="cx"> return false;
</span><del>-
</del><ins>+
+ VM& vm = pluginWorld().vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
</ins><span class="cx"> ExecState* exec = frame->script().globalObject(pluginWorld())->globalExec();
</span><del>- JSLockHolder lock(exec);
</del><span class="cx">
</span><span class="cx"> ConstructData constructData;
</span><span class="cx"> ConstructType constructType = object->methodTable()->getConstructData(object, constructData);
</span><span class="lines">@@ -995,7 +1007,7 @@
</span><span class="cx"> JSValue value = JSC::construct(exec, object, constructType, constructData, argList);
</span><span class="cx">
</span><span class="cx"> marshalValue(exec, value, resultData, resultLength);
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1013,13 +1025,16 @@
</span><span class="cx"> Frame* frame = core([m_pluginView webFrame]);
</span><span class="cx"> if (!frame)
</span><span class="cx"> return false;
</span><del>-
</del><ins>+
+ VM& vm = pluginWorld().vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
</ins><span class="cx"> ExecState* exec = frame->script().globalObject(pluginWorld())->globalExec();
</span><del>- JSLockHolder lock(exec);
</del><span class="cx"> JSValue value = object->get(exec, propertyName);
</span><span class="cx">
</span><span class="cx"> marshalValue(exec, value, resultData, resultLength);
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1034,13 +1049,16 @@
</span><span class="cx"> Frame* frame = core([m_pluginView webFrame]);
</span><span class="cx"> if (!frame)
</span><span class="cx"> return false;
</span><del>-
</del><ins>+
+ VM& vm = pluginWorld().vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
</ins><span class="cx"> ExecState* exec = frame->script().globalObject(pluginWorld())->globalExec();
</span><del>- JSLockHolder lock(exec);
</del><span class="cx"> JSValue value = object->get(exec, propertyName);
</span><span class="cx">
</span><span class="cx"> marshalValue(exec, value, resultData, resultLength);
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1058,15 +1076,18 @@
</span><span class="cx"> Frame* frame = core([m_pluginView webFrame]);
</span><span class="cx"> if (!frame)
</span><span class="cx"> return false;
</span><del>-
</del><ins>+
+ VM& vm = pluginWorld().vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
</ins><span class="cx"> ExecState* exec = frame->script().globalObject(pluginWorld())->globalExec();
</span><del>- JSLockHolder lock(exec);
</del><span class="cx">
</span><span class="cx"> JSValue value = demarshalValue(exec, valueData, valueLength);
</span><span class="cx"> PutPropertySlot slot(object);
</span><span class="cx"> object->methodTable()->put(object, exec, propertyName, value, slot);
</span><span class="cx">
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1084,14 +1105,17 @@
</span><span class="cx"> Frame* frame = core([m_pluginView webFrame]);
</span><span class="cx"> if (!frame)
</span><span class="cx"> return false;
</span><del>-
</del><ins>+
+ VM& vm = pluginWorld().vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
</ins><span class="cx"> ExecState* exec = frame->script().globalObject(pluginWorld())->globalExec();
</span><del>- JSLockHolder lock(exec);
</del><span class="cx">
</span><span class="cx"> JSValue value = demarshalValue(exec, valueData, valueLength);
</span><span class="cx"> object->methodTable()->putByIndex(object, exec, propertyName, value, false);
</span><span class="cx">
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1110,15 +1134,18 @@
</span><span class="cx"> if (!frame)
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ VM& vm = pluginWorld().vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
</ins><span class="cx"> ExecState* exec = frame->script().globalObject(pluginWorld())->globalExec();
</span><del>- JSLockHolder lock(exec);
</del><span class="cx"> if (!object->hasProperty(exec, propertyName)) {
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> object->methodTable()->deleteProperty(object, exec, propertyName);
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1136,16 +1163,19 @@
</span><span class="cx"> Frame* frame = core([m_pluginView webFrame]);
</span><span class="cx"> if (!frame)
</span><span class="cx"> return false;
</span><del>-
</del><ins>+
+ VM& vm = pluginWorld().vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
</ins><span class="cx"> ExecState* exec = frame->script().globalObject(pluginWorld())->globalExec();
</span><del>- JSLockHolder lock(exec);
</del><span class="cx"> if (!object->hasProperty(exec, propertyName)) {
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> object->methodTable()->deletePropertyByIndex(object, exec, propertyName);
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1163,11 +1193,15 @@
</span><span class="cx"> Frame* frame = core([m_pluginView webFrame]);
</span><span class="cx"> if (!frame)
</span><span class="cx"> return false;
</span><del>-
</del><ins>+
+ VM& vm = pluginWorld().vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
</ins><span class="cx"> ExecState* exec = frame->script().globalObject(pluginWorld())->globalExec();
</span><span class="cx"> bool result = object->hasProperty(exec, propertyName);
</span><del>- exec->clearException();
-
</del><ins>+ scope.clearException();
+
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1185,11 +1219,15 @@
</span><span class="cx"> Frame* frame = core([m_pluginView webFrame]);
</span><span class="cx"> if (!frame)
</span><span class="cx"> return false;
</span><del>-
</del><ins>+
+ VM& vm = pluginWorld().vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
</ins><span class="cx"> ExecState* exec = frame->script().globalObject(pluginWorld())->globalExec();
</span><span class="cx"> bool result = object->hasProperty(exec, propertyName);
</span><del>- exec->clearException();
-
</del><ins>+ scope.clearException();
+
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1207,11 +1245,14 @@
</span><span class="cx"> Frame* frame = core([m_pluginView webFrame]);
</span><span class="cx"> if (!frame)
</span><span class="cx"> return false;
</span><del>-
</del><ins>+
+ VM& vm = pluginWorld().vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
</ins><span class="cx"> ExecState* exec = frame->script().globalObject(pluginWorld())->globalExec();
</span><del>- JSLockHolder lock(exec);
</del><span class="cx"> JSValue func = object->get(exec, methodName);
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> return !func.isUndefined();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1229,9 +1270,12 @@
</span><span class="cx"> Frame* frame = core([m_pluginView webFrame]);
</span><span class="cx"> if (!frame)
</span><span class="cx"> return false;
</span><del>-
</del><ins>+
+ VM& vm = pluginWorld().vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
</ins><span class="cx"> ExecState* exec = frame->script().globalObject(pluginWorld())->globalExec();
</span><del>- JSLockHolder lock(exec);
</del><span class="cx">
</span><span class="cx"> PropertyNameArray propertyNames(exec, PropertyNameMode::Strings);
</span><span class="cx"> object->methodTable()->getPropertyNames(object, exec, propertyNames, EnumerationMode());
</span><span class="lines">@@ -1251,7 +1295,7 @@
</span><span class="cx">
</span><span class="cx"> memcpy(resultData, [data bytes], resultLength);
</span><span class="cx">
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -6936,6 +6936,9 @@
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> static NSAppleEventDescriptor* aeDescFromJSValue(ExecState* exec, JSC::JSValue jsValue)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
</ins><span class="cx"> NSAppleEventDescriptor* aeDesc = 0;
</span><span class="cx"> if (jsValue.isBoolean())
</span><span class="cx"> return [NSAppleEventDescriptor descriptorWithBoolean:jsValue.asBoolean()];
</span><span class="lines">@@ -6976,8 +6979,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> JSC::JSValue primitive = object->toPrimitive(exec);
</span><del>- if (exec->hadException()) {
- exec->clearException();
</del><ins>+ if (UNLIKELY(scope.exception())) {
+ scope.clearException();
</ins><span class="cx"> return [NSAppleEventDescriptor nullDescriptor];
</span><span class="cx"> }
</span><span class="cx"> return aeDescFromJSValue(exec, primitive);
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebKit/win/ChangeLog 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-09-07 Mark Lam <mark.lam@apple.com>
+
+ Add CatchScope and force all exception checks to be via ThrowScope or CatchScope.
+ https://bugs.webkit.org/show_bug.cgi?id=161498
+
+ Reviewed by Geoffrey Garen.
+
+ * Plugins/PluginPackage.cpp:
+ (WebCore::NPN_Evaluate):
+ (WebCore::NPN_Invoke):
+
</ins><span class="cx"> 2016-09-06 Per Arne Vollan <pvollan@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Null pointer crash under WebView::scrollOffset.
</span></span></pre></div>
<a id="trunkSourceWebKitwinPluginsPluginPackagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/Plugins/PluginPackage.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/Plugins/PluginPackage.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebKit/win/Plugins/PluginPackage.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -210,14 +210,18 @@
</span><span class="cx"> // PluginView, so we destroy it asynchronously.
</span><span class="cx"> PluginView::keepAlive(instance);
</span><span class="cx">
</span><del>- JSC::ExecState* exec = rootObject->globalObject()->globalExec();
- JSC::JSLockHolder lock(exec);
</del><ins>+ auto globalObject = rootObject->globalObject();
+ auto& vm = globalObject->vm();
+ JSC::JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
+ JSC::ExecState* exec = globalObject->globalExec();
</ins><span class="cx"> String scriptString = JSC::Bindings::convertNPStringToUTF16(s);
</span><span class="cx">
</span><del>- JSC::JSValue returnValue = JSC::evaluate(rootObject->globalObject()->globalExec(), makeSource(scriptString), JSC::JSValue());
</del><ins>+ JSC::JSValue returnValue = JSC::evaluate(exec, makeSource(scriptString), JSC::JSValue());
</ins><span class="cx">
</span><span class="cx"> JSC::Bindings::convertValueToNPVariant(exec, returnValue, variant);
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -247,8 +251,13 @@
</span><span class="cx"> JSC::Bindings::RootObject* rootObject = obj->rootObject;
</span><span class="cx"> if (!rootObject || !rootObject->isValid())
</span><span class="cx"> return false;
</span><del>- JSC::ExecState* exec = rootObject->globalObject()->globalExec();
- JSC::JSLockHolder lock(exec);
</del><ins>+
+ auto globalObject = rootObject->globalObject();
+ auto& vm = globalObject->vm();
+ JSC::JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
+ JSC::ExecState* exec = globalObject->globalExec();
</ins><span class="cx"> JSC::JSValue function = obj->imp->get(exec, JSC::Bindings::identifierFromNPIdentifier(exec, i->string()));
</span><span class="cx"> JSC::CallData callData;
</span><span class="cx"> JSC::CallType callType = getCallData(function, callData);
</span><span class="lines">@@ -262,7 +271,7 @@
</span><span class="cx">
</span><span class="cx"> // Convert and return the result of the function call.
</span><span class="cx"> JSC::Bindings::convertValueToNPVariant(exec, resultV, result);
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebKit2/ChangeLog 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-09-07 Mark Lam <mark.lam@apple.com>
+
+ Add CatchScope and force all exception checks to be via ThrowScope or CatchScope.
+ https://bugs.webkit.org/show_bug.cgi?id=161498
+
+ Reviewed by Geoffrey Garen.
+
+ * WebProcess/Plugins/Netscape/NPJSObject.cpp:
+ (WebKit::NPJSObject::hasMethod):
+ (WebKit::NPJSObject::hasProperty):
+ (WebKit::NPJSObject::getProperty):
+ (WebKit::NPJSObject::setProperty):
+ (WebKit::NPJSObject::removeProperty):
+ (WebKit::NPJSObject::construct):
+ (WebKit::NPJSObject::invoke):
+
</ins><span class="cx"> 2016-09-07 Konstantin Tokarev <annulen@yandex.ru>
</span><span class="cx">
</span><span class="cx"> [GTK] Make inspection of Inspector conditional on DEVELOPER_MODE
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapeNPJSObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.cpp (205568 => 205569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.cpp 2016-09-07 22:01:39 UTC (rev 205568)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPJSObject.cpp 2016-09-07 22:10:50 UTC (rev 205569)
</span><span class="lines">@@ -101,10 +101,12 @@
</span><span class="cx"> if (!exec)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- JSLockHolder lock(exec);
</del><ins>+ VM& vm = exec->vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
</ins><span class="cx">
</span><span class="cx"> JSValue value = m_jsObject->get(exec, identifierFromIdentifierRep(exec, identifierRep));
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx">
</span><span class="cx"> CallData callData;
</span><span class="cx"> return getCallData(value, callData) != CallType::None;
</span><span class="lines">@@ -147,7 +149,9 @@
</span><span class="cx"> if (!exec)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- JSLockHolder lock(exec);
</del><ins>+ VM& vm = exec->vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
</ins><span class="cx">
</span><span class="cx"> bool result;
</span><span class="cx"> if (identifierRep->isString())
</span><span class="lines">@@ -155,7 +159,7 @@
</span><span class="cx"> else
</span><span class="cx"> result = m_jsObject->hasProperty(exec, identifierRep->number());
</span><span class="cx">
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -167,7 +171,10 @@
</span><span class="cx"> if (!exec)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- JSLockHolder lock(exec);
</del><ins>+ VM& vm = exec->vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
</ins><span class="cx"> JSValue jsResult;
</span><span class="cx"> if (identifierRep->isString())
</span><span class="cx"> jsResult = m_jsObject->get(exec, identifierFromIdentifierRep(exec, identifierRep));
</span><span class="lines">@@ -175,7 +182,7 @@
</span><span class="cx"> jsResult = m_jsObject->get(exec, identifierRep->number());
</span><span class="cx">
</span><span class="cx"> m_objectMap->convertJSValueToNPVariant(exec, jsResult, *result);
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -187,7 +194,9 @@
</span><span class="cx"> if (!exec)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- JSLockHolder lock(exec);
</del><ins>+ VM& vm = exec->vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
</ins><span class="cx">
</span><span class="cx"> JSValue jsValue = m_objectMap->convertNPVariantToJSValue(exec, m_objectMap->globalObject(), *value);
</span><span class="cx"> if (identifierRep->isString()) {
</span><span class="lines">@@ -195,7 +204,7 @@
</span><span class="cx"> m_jsObject->methodTable()->put(m_jsObject.get(), exec, identifierFromIdentifierRep(exec, identifierRep), jsValue, slot);
</span><span class="cx"> } else
</span><span class="cx"> m_jsObject->methodTable()->putByIndex(m_jsObject.get(), exec, identifierRep->number(), jsValue, false);
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -208,12 +217,15 @@
</span><span class="cx"> if (!exec)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- JSLockHolder lock(exec);
</del><ins>+ VM& vm = exec->vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
</ins><span class="cx"> if (identifierRep->isString()) {
</span><span class="cx"> Identifier identifier = identifierFromIdentifierRep(exec, identifierRep);
</span><span class="cx">
</span><span class="cx"> if (!m_jsObject->hasProperty(exec, identifier)) {
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -220,7 +232,7 @@
</span><span class="cx"> m_jsObject->methodTable()->deleteProperty(m_jsObject.get(), exec, identifier);
</span><span class="cx"> } else {
</span><span class="cx"> if (!m_jsObject->hasProperty(exec, identifierRep->number())) {
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -227,7 +239,7 @@
</span><span class="cx"> m_jsObject->methodTable()->deletePropertyByIndex(m_jsObject.get(), exec, identifierRep->number());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -259,7 +271,9 @@
</span><span class="cx"> if (!exec)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- JSLockHolder lock(exec);
</del><ins>+ VM& vm = exec->vm();
+ JSLockHolder lock(vm);
+ auto scope = DECLARE_CATCH_SCOPE(vm);
</ins><span class="cx">
</span><span class="cx"> ConstructData constructData;
</span><span class="cx"> ConstructType constructType = getConstructData(m_jsObject.get(), constructData);
</span><span class="lines">@@ -275,7 +289,7 @@
</span><span class="cx">
</span><span class="cx"> // Convert and return the new object.
</span><span class="cx"> m_objectMap->convertJSValueToNPVariant(exec, value, *result);
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -282,6 +296,9 @@
</span><span class="cx">
</span><span class="cx"> bool NPJSObject::invoke(ExecState* exec, JSGlobalObject* globalObject, JSValue function, const NPVariant* arguments, uint32_t argumentCount, NPVariant* result)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_CATCH_SCOPE(vm);
+
</ins><span class="cx"> CallData callData;
</span><span class="cx"> CallType callType = getCallData(function, callData);
</span><span class="cx"> if (callType == CallType::None)
</span><span class="lines">@@ -296,7 +313,7 @@
</span><span class="cx">
</span><span class="cx"> // Convert and return the result of the function call.
</span><span class="cx"> m_objectMap->convertJSValueToNPVariant(exec, value, *result);
</span><del>- exec->clearException();
</del><ins>+ scope.clearException();
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>