<!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>[194400] 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/194400">194400</a></dd>
<dt>Author</dt> <dd>keith_miller@apple.com</dd>
<dt>Date</dt> <dd>2015-12-23 15:45:17 -0800 (Wed, 23 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSC] Bugfix for intrinsic getters with dictionary structures.
https://bugs.webkit.org/show_bug.cgi?id=152538
Reviewed by Mark Lam.
Intrinsic getters did not check if an object was a dictionary. This meant, if a property on
the prototype chain of a dictionary was an intrinsic getter we would IC it. Later, if a
property is added to the dictionary the IC would still return the result of the intrinsic.
The fix is to no longer IC intrinsic getters if the base object is a dictionary.
* jit/Repatch.cpp:
(JSC::tryCacheGetByID):
* tests/stress/typedarray-length-dictionary.js: Added.
(len):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorejitRepatchcpp">trunk/Source/JavaScriptCore/jit/Repatch.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstresstypedarraylengthdictionaryjs">trunk/Source/JavaScriptCore/tests/stress/typedarray-length-dictionary.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (194399 => 194400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-12-23 23:31:44 UTC (rev 194399)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-12-23 23:45:17 UTC (rev 194400)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-12-23 Keith Miller <keith_miller@apple.com>
+
+ [JSC] Bugfix for intrinsic getters with dictionary structures.
+ https://bugs.webkit.org/show_bug.cgi?id=152538
+
+ Reviewed by Mark Lam.
+
+ Intrinsic getters did not check if an object was a dictionary. This meant, if a property on
+ the prototype chain of a dictionary was an intrinsic getter we would IC it. Later, if a
+ property is added to the dictionary the IC would still return the result of the intrinsic.
+ The fix is to no longer IC intrinsic getters if the base object is a dictionary.
+
+ * jit/Repatch.cpp:
+ (JSC::tryCacheGetByID):
+ * tests/stress/typedarray-length-dictionary.js: Added.
+ (len):
+
</ins><span class="cx"> 2015-12-23 Andy VanWagoner <andy@instructure.com>
</span><span class="cx">
</span><span class="cx"> [INTL] Implement DateTime Format Functions
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitRepatchcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/Repatch.cpp (194399 => 194400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/Repatch.cpp 2015-12-23 23:31:44 UTC (rev 194399)
+++ trunk/Source/JavaScriptCore/jit/Repatch.cpp 2015-12-23 23:45:17 UTC (rev 194400)
</span><span class="lines">@@ -224,31 +224,19 @@
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<AccessCase> newCase;
</span><del>- JSFunction* getter = nullptr;
- ObjectPropertyConditionSet conditionSet;
- JSCell* baseCell = baseValue.asCell();
- Structure* structure = baseCell->structure(vm);
</del><span class="cx">
</span><del>- if (slot.isCacheableGetter())
- getter = jsDynamicCast<JSFunction*>(slot.getterSetter()->getter());
-
</del><span class="cx"> if (isJSArray(baseValue) && propertyName == exec->propertyNames().length)
</span><span class="cx"> newCase = AccessCase::getLength(vm, codeBlock, AccessCase::ArrayLength);
</span><span class="cx"> else if (isJSString(baseValue) && propertyName == exec->propertyNames().length)
</span><span class="cx"> newCase = AccessCase::getLength(vm, codeBlock, AccessCase::StringLength);
</span><del>- else if (getter && AccessCase::canEmitIntrinsicGetter(getter, structure)) {
- if (slot.slotBase() != baseValue) {
- conditionSet = generateConditionsForPrototypePropertyHit(vm, codeBlock->ownerExecutable(), exec, structure, slot.slotBase(), propertyName.impl());
- if (!conditionSet.isValid())
- return GiveUpOnCache;
- }
-
- newCase = AccessCase::getIntrinsic(vm, codeBlock, getter, slot.cachedOffset(), structure, conditionSet);
-
- } else {
</del><ins>+ else {
</ins><span class="cx"> if (!slot.isCacheable() && !slot.isUnset())
</span><span class="cx"> return GiveUpOnCache;
</span><span class="cx">
</span><ins>+ ObjectPropertyConditionSet conditionSet;
+ JSCell* baseCell = baseValue.asCell();
+ Structure* structure = baseCell->structure(vm);
+
</ins><span class="cx"> bool loadTargetFromProxy = false;
</span><span class="cx"> if (baseCell->type() == PureForwardingProxyType) {
</span><span class="cx"> baseValue = jsCast<JSProxy*>(baseCell)->target();
</span><span class="lines">@@ -297,24 +285,32 @@
</span><span class="cx">
</span><span class="cx"> if (!conditionSet.isValid())
</span><span class="cx"> return GiveUpOnCache;
</span><del>-
</del><ins>+
</ins><span class="cx"> offset = slot.isUnset() ? invalidOffset : conditionSet.slotBaseCondition().offset();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- AccessCase::AccessType type;
- if (slot.isCacheableValue())
- type = AccessCase::Load;
- else if (slot.isUnset())
- type = AccessCase::Miss;
- else if (slot.isCacheableGetter())
- type = AccessCase::Getter;
- else
- type = AccessCase::CustomGetter;
</del><ins>+ JSFunction* getter = nullptr;
+ if (slot.isCacheableGetter())
+ getter = jsDynamicCast<JSFunction*>(slot.getterSetter()->getter());
</ins><span class="cx">
</span><del>- newCase = AccessCase::get(
- vm, codeBlock, type, offset, structure, conditionSet, loadTargetFromProxy,
- slot.watchpointSet(), slot.isCacheableCustom() ? slot.customGetter() : nullptr,
- slot.isCacheableCustom() ? slot.slotBase() : nullptr);
</del><ins>+ if (!loadTargetFromProxy && getter && AccessCase::canEmitIntrinsicGetter(getter, structure))
+ newCase = AccessCase::getIntrinsic(vm, codeBlock, getter, slot.cachedOffset(), structure, conditionSet);
+ else {
+ AccessCase::AccessType type;
+ if (slot.isCacheableValue())
+ type = AccessCase::Load;
+ else if (slot.isUnset())
+ type = AccessCase::Miss;
+ else if (slot.isCacheableGetter())
+ type = AccessCase::Getter;
+ else
+ type = AccessCase::CustomGetter;
+
+ newCase = AccessCase::get(
+ vm, codeBlock, type, offset, structure, conditionSet, loadTargetFromProxy,
+ slot.watchpointSet(), slot.isCacheableCustom() ? slot.customGetter() : nullptr,
+ slot.isCacheableCustom() ? slot.slotBase() : nullptr);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MacroAssemblerCodePtr codePtr =
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstresstypedarraylengthdictionaryjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/typedarray-length-dictionary.js (0 => 194400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/typedarray-length-dictionary.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/typedarray-length-dictionary.js 2015-12-23 23:45:17 UTC (rev 194400)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+// This tests that we do not inline cache intrinsic getters when the base structure is a dictionary.
+
+foo = new Int32Array(10);
+
+function len() {
+ return foo.length;
+}
+noInline(len);
+
+foo.bar = 1;
+foo.baz = 2;
+delete foo.bar;
+
+for (i = 0; i < 1000; i++)
+ len()
+
+Object.defineProperty(foo, "length", { value: 1 });
+if (len() !== 1)
+ throw "bad result";
</ins></span></pre>
</div>
</div>
</body>
</html>