<!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>[212146] 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/212146">212146</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2017-02-10 13:34:27 -0800 (Fri, 10 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>StructureStubInfo::considerCaching() should write barrier its owner CodeBlock when buffering a new Structure.
https://bugs.webkit.org/show_bug.cgi?id=168137
<rdar://problem/28656664>
Reviewed by Filip Pizlo.
If we're adding a new structure to StructureStubInfo's bufferedStructures, we
should write barrier the StubInfo's owner CodeBlock because that structure may be
collected during the next GC. Write barrier-ing the owner CodeBlock ensures that
CodeBlock::finalizeBaselineJITInlineCaches() is called on it during the GC,
which, in turn, gives the StructureStubInfo the opportunity to filter out the
dead structure.
* bytecode/StructureStubInfo.h:
(JSC::StructureStubInfo::considerCaching):
* jit/JITOperations.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeStructureStubInfoh">trunk/Source/JavaScriptCore/bytecode/StructureStubInfo.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITOperationscpp">trunk/Source/JavaScriptCore/jit/JITOperations.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (212145 => 212146)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2017-02-10 21:31:28 UTC (rev 212145)
+++ trunk/Source/JavaScriptCore/ChangeLog 2017-02-10 21:34:27 UTC (rev 212146)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2017-02-10 Mark Lam <mark.lam@apple.com>
+
+ StructureStubInfo::considerCaching() should write barrier its owner CodeBlock when buffering a new Structure.
+ https://bugs.webkit.org/show_bug.cgi?id=168137
+ <rdar://problem/28656664>
+
+ Reviewed by Filip Pizlo.
+
+ If we're adding a new structure to StructureStubInfo's bufferedStructures, we
+ should write barrier the StubInfo's owner CodeBlock because that structure may be
+ collected during the next GC. Write barrier-ing the owner CodeBlock ensures that
+ CodeBlock::finalizeBaselineJITInlineCaches() is called on it during the GC,
+ which, in turn, gives the StructureStubInfo the opportunity to filter out the
+ dead structure.
+
+ * bytecode/StructureStubInfo.h:
+ (JSC::StructureStubInfo::considerCaching):
+ * jit/JITOperations.cpp:
+
</ins><span class="cx"> 2017-02-10 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] Web Inspector: generate an NS_ENUM containing platforms supported by the protocol code generator
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeStructureStubInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/StructureStubInfo.h (212145 => 212146)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/StructureStubInfo.h 2017-02-10 21:31:28 UTC (rev 212145)
+++ trunk/Source/JavaScriptCore/bytecode/StructureStubInfo.h 2017-02-10 21:34:27 UTC (rev 212146)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2008, 2012-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2008-2017 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">@@ -25,6 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><ins>+#include "CodeBlock.h"
</ins><span class="cx"> #include "CodeOrigin.h"
</span><span class="cx"> #include "Instruction.h"
</span><span class="cx"> #include "JITStubRoutine.h"
</span><span class="lines">@@ -85,7 +86,7 @@
</span><span class="cx"> // This returns true if it has marked everything that it will ever mark.
</span><span class="cx"> bool propagateTransitions(SlotVisitor&);
</span><span class="cx">
</span><del>- ALWAYS_INLINE bool considerCaching(Structure* structure)
</del><ins>+ ALWAYS_INLINE bool considerCaching(CodeBlock* codeBlock, Structure* structure)
</ins><span class="cx"> {
</span><span class="cx"> // We never cache non-cells.
</span><span class="cx"> if (!structure)
</span><span class="lines">@@ -137,7 +138,12 @@
</span><span class="cx"> // we don't already have a case buffered for. Note that if this returns true but the
</span><span class="cx"> // bufferingCountdown is not zero then we will buffer the access case for later without
</span><span class="cx"> // immediately generating code for it.
</span><del>- return bufferedStructures.add(structure);
</del><ins>+ bool isNewlyAdded = bufferedStructures.add(structure);
+ if (isNewlyAdded) {
+ VM& vm = *codeBlock->vm();
+ vm.heap.writeBarrier(codeBlock);
+ }
+ return isNewlyAdded;
</ins><span class="cx"> }
</span><span class="cx"> countdown--;
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOperationscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOperations.cpp (212145 => 212146)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOperations.cpp 2017-02-10 21:31:28 UTC (rev 212145)
+++ trunk/Source/JavaScriptCore/jit/JITOperations.cpp 2017-02-10 21:34:27 UTC (rev 212146)
</span><span class="lines">@@ -210,7 +210,7 @@
</span><span class="cx"> baseValue.getPropertySlot(exec, ident, slot);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><span class="cx">
</span><del>- if (stubInfo->considerCaching(baseValue.structureOrNull()) && !slot.isTaintedByOpaqueObject() && (slot.isCacheableValue() || slot.isCacheableGetter() || slot.isUnset()))
</del><ins>+ if (stubInfo->considerCaching(exec->codeBlock(), baseValue.structureOrNull()) && !slot.isTaintedByOpaqueObject() && (slot.isCacheableValue() || slot.isCacheableGetter() || slot.isUnset()))
</ins><span class="cx"> repatchGetByID(exec, baseValue, ident, slot, *stubInfo, GetByIDKind::Pure);
</span><span class="cx">
</span><span class="cx"> return JSValue::encode(slot.getPureResult());
</span><span class="lines">@@ -259,7 +259,7 @@
</span><span class="cx"> LOG_IC((ICEvent::OperationGetByIdOptimize, baseValue.classInfoOrNull(*vm), ident));
</span><span class="cx">
</span><span class="cx"> return JSValue::encode(baseValue.getPropertySlot(exec, ident, [&] (bool found, PropertySlot& slot) -> JSValue {
</span><del>- if (stubInfo->considerCaching(baseValue.structureOrNull()))
</del><ins>+ if (stubInfo->considerCaching(exec->codeBlock(), baseValue.structureOrNull()))
</ins><span class="cx"> repatchGetByID(exec, baseValue, ident, slot, *stubInfo, GetByIDKind::Normal);
</span><span class="cx"> return found ? slot.getValue(exec, ident) : jsUndefined();
</span><span class="cx"> }));
</span><span class="lines">@@ -288,7 +288,7 @@
</span><span class="cx">
</span><span class="cx"> RELEASE_ASSERT(accessType == stubInfo->accessType);
</span><span class="cx">
</span><del>- if (stubInfo->considerCaching(asObject(base)->structure()))
</del><ins>+ if (stubInfo->considerCaching(exec->codeBlock(), asObject(base)->structure()))
</ins><span class="cx"> repatchIn(exec, base, ident, result, slot, *stubInfo);
</span><span class="cx">
</span><span class="cx"> return JSValue::encode(jsBoolean(result));
</span><span class="lines">@@ -403,7 +403,8 @@
</span><span class="cx"> JSValue value = JSValue::decode(encodedValue);
</span><span class="cx"> JSValue baseValue = JSValue::decode(encodedBase);
</span><span class="cx"> LOG_IC((ICEvent::OperationPutByIdStrictOptimize, baseValue.classInfoOrNull(*vm), ident));
</span><del>- PutPropertySlot slot(baseValue, true, exec->codeBlock()->putByIdContext());
</del><ins>+ CodeBlock* codeBlock = exec->codeBlock();
+ PutPropertySlot slot(baseValue, true, codeBlock->putByIdContext());
</ins><span class="cx">
</span><span class="cx"> Structure* structure = baseValue.isCell() ? baseValue.asCell()->structure(*vm) : nullptr;
</span><span class="cx"> baseValue.putInline(exec, ident, value, slot);
</span><span class="lines">@@ -412,7 +413,7 @@
</span><span class="cx"> if (accessType != static_cast<AccessType>(stubInfo->accessType))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (stubInfo->considerCaching(structure))
</del><ins>+ if (stubInfo->considerCaching(codeBlock, structure))
</ins><span class="cx"> repatchPutByID(exec, baseValue, structure, ident, slot, *stubInfo, NotDirect);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -430,7 +431,8 @@
</span><span class="cx"> JSValue value = JSValue::decode(encodedValue);
</span><span class="cx"> JSValue baseValue = JSValue::decode(encodedBase);
</span><span class="cx"> LOG_IC((ICEvent::OperationPutByIdNonStrictOptimize, baseValue.classInfoOrNull(*vm), ident));
</span><del>- PutPropertySlot slot(baseValue, false, exec->codeBlock()->putByIdContext());
</del><ins>+ CodeBlock* codeBlock = exec->codeBlock();
+ PutPropertySlot slot(baseValue, false, codeBlock->putByIdContext());
</ins><span class="cx">
</span><span class="cx"> Structure* structure = baseValue.isCell() ? baseValue.asCell()->structure(*vm) : nullptr;
</span><span class="cx"> baseValue.putInline(exec, ident, value, slot);
</span><span class="lines">@@ -439,7 +441,7 @@
</span><span class="cx"> if (accessType != static_cast<AccessType>(stubInfo->accessType))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (stubInfo->considerCaching(structure))
</del><ins>+ if (stubInfo->considerCaching(codeBlock, structure))
</ins><span class="cx"> repatchPutByID(exec, baseValue, structure, ident, slot, *stubInfo, NotDirect);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -456,7 +458,8 @@
</span><span class="cx"> JSValue value = JSValue::decode(encodedValue);
</span><span class="cx"> JSObject* baseObject = asObject(JSValue::decode(encodedBase));
</span><span class="cx"> LOG_IC((ICEvent::OperationPutByIdDirectStrictOptimize, baseObject->classInfo(*vm), ident));
</span><del>- PutPropertySlot slot(baseObject, true, exec->codeBlock()->putByIdContext());
</del><ins>+ CodeBlock* codeBlock = exec->codeBlock();
+ PutPropertySlot slot(baseObject, true, codeBlock->putByIdContext());
</ins><span class="cx">
</span><span class="cx"> Structure* structure = baseObject->structure(*vm);
</span><span class="cx"> baseObject->putDirect(exec->vm(), ident, value, slot);
</span><span class="lines">@@ -464,7 +467,7 @@
</span><span class="cx"> if (accessType != static_cast<AccessType>(stubInfo->accessType))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (stubInfo->considerCaching(structure))
</del><ins>+ if (stubInfo->considerCaching(codeBlock, structure))
</ins><span class="cx"> repatchPutByID(exec, baseObject, structure, ident, slot, *stubInfo, Direct);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -481,7 +484,8 @@
</span><span class="cx"> JSValue value = JSValue::decode(encodedValue);
</span><span class="cx"> JSObject* baseObject = asObject(JSValue::decode(encodedBase));
</span><span class="cx"> LOG_IC((ICEvent::OperationPutByIdDirectNonStrictOptimize, baseObject->classInfo(*vm), ident));
</span><del>- PutPropertySlot slot(baseObject, false, exec->codeBlock()->putByIdContext());
</del><ins>+ CodeBlock* codeBlock = exec->codeBlock();
+ PutPropertySlot slot(baseObject, false, codeBlock->putByIdContext());
</ins><span class="cx">
</span><span class="cx"> Structure* structure = baseObject->structure(*vm);
</span><span class="cx"> baseObject->putDirect(exec->vm(), ident, value, slot);
</span><span class="lines">@@ -489,7 +493,7 @@
</span><span class="cx"> if (accessType != static_cast<AccessType>(stubInfo->accessType))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (stubInfo->considerCaching(structure))
</del><ins>+ if (stubInfo->considerCaching(codeBlock, structure))
</ins><span class="cx"> repatchPutByID(exec, baseObject, structure, ident, slot, *stubInfo, Direct);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -612,7 +616,7 @@
</span><span class="cx"> ConcurrentJSLocker locker(codeBlock->m_lock);
</span><span class="cx"> byValInfo->arrayProfile->computeUpdatedPrediction(locker, codeBlock, structure);
</span><span class="cx">
</span><del>- JIT::compilePutByVal(&vm, exec->codeBlock(), byValInfo, returnAddress, arrayMode);
</del><ins>+ JIT::compilePutByVal(&vm, codeBlock, byValInfo, returnAddress, arrayMode);
</ins><span class="cx"> optimizationResult = OptimizationResult::Optimized;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -696,7 +700,7 @@
</span><span class="cx"> ConcurrentJSLocker locker(codeBlock->m_lock);
</span><span class="cx"> byValInfo->arrayProfile->computeUpdatedPrediction(locker, codeBlock, structure);
</span><span class="cx">
</span><del>- JIT::compileDirectPutByVal(&vm, exec->codeBlock(), byValInfo, returnAddress, arrayMode);
</del><ins>+ JIT::compileDirectPutByVal(&vm, codeBlock, byValInfo, returnAddress, arrayMode);
</ins><span class="cx"> optimizationResult = OptimizationResult::Optimized;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>