<!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>[191016] trunk/Source/JavaScriptCore</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/191016">191016</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2015-10-13 17:12:18 -0700 (Tue, 13 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>We were creating a GCAwareJITStubRoutineWithExceptionHandler when we didn't actually have an exception handler in the CodeBlock's exception handler table
https://bugs.webkit.org/show_bug.cgi?id=150016
Reviewed by Geoffrey Garen.
There was a bug where we created a GCAwareJITStubRoutineWithExceptionHandler
for inline caches that were custom setters/getters (but not JS getters/setters).
This is wrong; we only create GCAwareJITStubRoutineWithExceptionHandler when we have
an inline cache with a JS getter/setter call which causes the inline cache to add itself
to the CodeBlock's exception handling table. The problem was that we created
a GCAwareJITStubRoutineWithExceptionHandler that tried to remove itself from
the exception handler table only to find out that it didn't have an entry in the table.
* bytecode/PolymorphicAccess.cpp:
(JSC::PolymorphicAccess::regenerate):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodePolymorphicAccesscpp">trunk/Source/JavaScriptCore/bytecode/PolymorphicAccess.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitGCAwareJITStubRoutinecpp">trunk/Source/JavaScriptCore/jit/GCAwareJITStubRoutine.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (191015 => 191016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-10-14 00:10:07 UTC (rev 191015)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-10-14 00:12:18 UTC (rev 191016)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-10-13 Saam barati <sbarati@apple.com>
+
+ We were creating a GCAwareJITStubRoutineWithExceptionHandler when we didn't actually have an exception handler in the CodeBlock's exception handler table
+ https://bugs.webkit.org/show_bug.cgi?id=150016
+
+ Reviewed by Geoffrey Garen.
+
+ There was a bug where we created a GCAwareJITStubRoutineWithExceptionHandler
+ for inline caches that were custom setters/getters (but not JS getters/setters).
+ This is wrong; we only create GCAwareJITStubRoutineWithExceptionHandler when we have
+ an inline cache with a JS getter/setter call which causes the inline cache to add itself
+ to the CodeBlock's exception handling table. The problem was that we created
+ a GCAwareJITStubRoutineWithExceptionHandler that tried to remove itself from
+ the exception handler table only to find out that it didn't have an entry in the table.
+
+ * bytecode/PolymorphicAccess.cpp:
+ (JSC::PolymorphicAccess::regenerate):
+
</ins><span class="cx"> 2015-10-13 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Simplify WeakBlock visit and reap phases
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodePolymorphicAccesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/PolymorphicAccess.cpp (191015 => 191016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/PolymorphicAccess.cpp 2015-10-14 00:10:07 UTC (rev 191015)
+++ trunk/Source/JavaScriptCore/bytecode/PolymorphicAccess.cpp 2015-10-14 00:12:18 UTC (rev 191016)
</span><span class="lines">@@ -1324,6 +1324,8 @@
</span><span class="cx"> failure = state.failAndRepatch;
</span><span class="cx"> failure.append(jit.jump());
</span><span class="cx">
</span><ins>+ CodeBlock* codeBlockThatOwnsExceptionHandlers = nullptr;
+ CallSiteIndex callSiteIndexForExceptionHandling;
</ins><span class="cx"> if (state.needsToRestoreRegistersIfException() && hasJSGetterSetterCall) {
</span><span class="cx"> // Emit the exception handler.
</span><span class="cx"> // Note that this code is only reachable when doing genericUnwind from a pure JS getter/setter .
</span><span class="lines">@@ -1354,6 +1356,12 @@
</span><span class="cx"> handlerToRegister.end = newExceptionHandlingCallSite.bits() + 1;
</span><span class="cx"> codeBlock->appendExceptionHandler(handlerToRegister);
</span><span class="cx"> });
</span><ins>+
+ // We set these to indicate to the stub to remove itself from the CodeBlock's
+ // exception handler table when it is deallocated.
+ codeBlockThatOwnsExceptionHandlers = codeBlock;
+ ASSERT(JITCode::isOptimizingJIT(codeBlockThatOwnsExceptionHandlers->jitType()));
+ callSiteIndexForExceptionHandling = state.callSiteIndexForExceptionHandling();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LinkBuffer linkBuffer(vm, jit, codeBlock, JITCompilationCanFail);
</span><span class="lines">@@ -1386,14 +1394,6 @@
</span><span class="cx"> for (auto& entry : cases)
</span><span class="cx"> doesCalls |= entry->doesCalls();
</span><span class="cx">
</span><del>- CodeBlock* codeBlockThatOwnsExceptionHandlers = nullptr;
- CallSiteIndex callSiteIndexForExceptionHandling = state.originalCallSiteIndex();
- if (state.needsToRestoreRegistersIfException()) {
- codeBlockThatOwnsExceptionHandlers = codeBlock;
- ASSERT(JITCode::isOptimizingJIT(codeBlockThatOwnsExceptionHandlers->jitType()));
- callSiteIndexForExceptionHandling = state.callSiteIndexForExceptionHandling();
- }
-
</del><span class="cx"> m_stubRoutine = createJITStubRoutine(code, vm, codeBlock, doesCalls, nullptr, codeBlockThatOwnsExceptionHandlers, callSiteIndexForExceptionHandling);
</span><span class="cx"> m_watchpoints = WTF::move(state.watchpoints);
</span><span class="cx"> if (!state.weakReferences.isEmpty())
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitGCAwareJITStubRoutinecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/GCAwareJITStubRoutine.cpp (191015 => 191016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/GCAwareJITStubRoutine.cpp 2015-10-14 00:10:07 UTC (rev 191015)
+++ trunk/Source/JavaScriptCore/jit/GCAwareJITStubRoutine.cpp 2015-10-14 00:12:18 UTC (rev 191016)
</span><span class="lines">@@ -105,6 +105,7 @@
</span><span class="cx"> , m_exceptionHandlerCallSiteIndex(exceptionHandlerCallSiteIndex)
</span><span class="cx"> {
</span><span class="cx"> RELEASE_ASSERT(m_codeBlockWithExceptionHandler);
</span><ins>+ ASSERT(!!m_codeBlockWithExceptionHandler->handlerForIndex(exceptionHandlerCallSiteIndex.bits()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GCAwareJITStubRoutineWithExceptionHandler::aboutToDie()
</span></span></pre>
</div>
</div>
</body>
</html>