Modified: trunk/Source/_javascript_Core/ChangeLog (209006 => 209007)
--- trunk/Source/_javascript_Core/ChangeLog 2016-11-28 20:28:15 UTC (rev 209006)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-11-28 20:44:25 UTC (rev 209007)
@@ -1,3 +1,16 @@
+2016-11-28 Mark Lam <[email protected]>
+
+ Fix exception scope verification failures in LLIntSlowPaths.cpp.
+ https://bugs.webkit.org/show_bug.cgi?id=164969
+
+ Reviewed by Geoffrey Garen.
+
+ * llint/LLIntSlowPaths.cpp:
+ (JSC::LLInt::getByVal):
+ (JSC::LLInt::setUpCall):
+ (JSC::LLInt::varargsSetup):
+ (JSC::LLInt::LLINT_SLOW_PATH_DECL):
+
2016-11-26 Yusuke Suzuki <[email protected]>
[WTF] Import std::optional reference implementation as WTF::Optional
Modified: trunk/Source/_javascript_Core/llint/LLIntSlowPaths.cpp (209006 => 209007)
--- trunk/Source/_javascript_Core/llint/LLIntSlowPaths.cpp 2016-11-28 20:28:15 UTC (rev 209006)
+++ trunk/Source/_javascript_Core/llint/LLIntSlowPaths.cpp 2016-11-28 20:44:25 UTC (rev 209007)
@@ -814,7 +814,7 @@
uint32_t i = subscript.asUInt32();
if (isJSString(baseValue) && asString(baseValue)->canGetIndex(i))
return asString(baseValue)->getIndex(exec, i);
-
+ scope.release();
return baseValue.get(exec, i);
}
@@ -822,6 +822,7 @@
RETURN_IF_EXCEPTION(scope, JSValue());
auto property = subscript.toPropertyKey(exec);
RETURN_IF_EXCEPTION(scope, JSValue());
+ scope.release();
return baseValue.get(exec, property);
}
@@ -1306,7 +1307,8 @@
CodeBlock** codeBlockSlot = execCallee->addressOfCodeBlock();
JSObject* error = functionExecutable->prepareForExecution<FunctionExecutable>(vm, callee, scope, kind, *codeBlockSlot);
- if (error)
+ ASSERT(throwScope.exception() == error);
+ if (UNLIKELY(error))
LLINT_CALL_THROW(exec, error);
codeBlock = *codeBlockSlot;
ASSERT(codeBlock);
@@ -1446,6 +1448,7 @@
execCallee->uncheckedR(CallFrameSlot::callee) = calleeAsValue;
exec->setCurrentVPC(pc);
+ throwScope.release();
return setUpCall(execCallee, pc, kind, calleeAsValue);
}
@@ -1479,8 +1482,10 @@
execCallee->setCodeBlock(0);
exec->setCurrentVPC(pc);
- if (!isHostFunction(calleeAsValue, globalFuncEval))
+ if (!isHostFunction(calleeAsValue, globalFuncEval)) {
+ throwScope.release();
return setUpCall(execCallee, pc, CodeForCall, calleeAsValue);
+ }
vm.hostCallReturnValue = eval(execCallee);
LLINT_CALL_RETURN(exec, execCallee, LLInt::getCodePtr(getHostCallReturnValue));
@@ -1585,6 +1590,7 @@
}
bool hasProperty = scope->hasProperty(exec, ident);
+ LLINT_CHECK_EXCEPTION();
if (hasProperty
&& scope->isGlobalLexicalEnvironment()
&& !isInitialization(getPutInfo.initializationMode())) {