<!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>[180309] branches/safari-600.4.10-branch/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/180309">180309</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2015-02-18 15:14:36 -0800 (Wed, 18 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/179329">r179329</a>. rdar://problem/19738498</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari600410branchSourceJavaScriptCoreChangeLog">branches/safari-600.4.10-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari600410branchSourceJavaScriptCorebytecompilerNodesCodegencpp">branches/safari-600.4.10-branch/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari600410branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4.10-branch/Source/JavaScriptCore/ChangeLog (180308 => 180309)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4.10-branch/Source/JavaScriptCore/ChangeLog 2015-02-18 23:05:12 UTC (rev 180308)
+++ branches/safari-600.4.10-branch/Source/JavaScriptCore/ChangeLog 2015-02-18 23:14:36 UTC (rev 180309)
</span><span class="lines">@@ -1,3 +1,43 @@
</span><ins>+2015-01-28 Matthew <matthew_hanson@apple.com>
+
+ Merge r178365. rdar://problem/19738498
+
+ 2015-01-13 Geoffrey Garen <ggaren@apple.com>
+
+ Out of bounds access in BytecodeGenerator::emitGetById under DotAccessorNode::emitBytecode
+ https://bugs.webkit.org/show_bug.cgi?id=140397
+
+ Reviewed by Geoffrey Garen.
+
+ Patch by Alexey Proskuryakov.
+
+ Reviewed, performance tested, and ChangeLogged by Geoffrey Garen.
+
+ No performance change.
+
+ No test, since this is a small past-the-end read, which is very
+ difficult to turn into a reproducible failing test -- and existing tests
+ crash reliably using ASan.
+
+ * bytecompiler/NodesCodegen.cpp:
+ (JSC::BracketAccessorNode::emitBytecode):
+ (JSC::DotAccessorNode::emitBytecode):
+ (JSC::FunctionCallBracketNode::emitBytecode):
+ (JSC::PostfixNode::emitResolve):
+ (JSC::DeleteBracketNode::emitBytecode):
+ (JSC::DeleteDotNode::emitBytecode):
+ (JSC::PrefixNode::emitResolve):
+ (JSC::UnaryOpNode::emitBytecode):
+ (JSC::BitwiseNotNode::emitBytecode):
+ (JSC::BinaryOpNode::emitBytecode):
+ (JSC::EqualNode::emitBytecode):
+ (JSC::StrictEqualNode::emitBytecode):
+ (JSC::ThrowableBinaryOpNode::emitBytecode):
+ (JSC::AssignDotNode::emitBytecode):
+ (JSC::AssignBracketNode::emitBytecode): Use RefPtr in more places. Any
+ register used across a call to a function that might allocate a new
+ temporary register must be held in a RefPtr.
+
</ins><span class="cx"> 2015-02-18 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r178311
</span></span></pre></div>
<a id="branchessafari600410branchSourceJavaScriptCorebytecompilerNodesCodegencpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4.10-branch/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp (180308 => 180309)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4.10-branch/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 2015-02-18 23:05:12 UTC (rev 180308)
+++ branches/safari-600.4.10-branch/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 2015-02-18 23:14:36 UTC (rev 180309)
</span><span class="lines">@@ -366,9 +366,9 @@
</span><span class="cx"> if (m_base->isResolveNode()
</span><span class="cx"> && generator.willResolveToArguments(static_cast<ResolveNode*>(m_base)->identifier())
</span><span class="cx"> && !generator.symbolTable().slowArguments()) {
</span><del>- RegisterID* property = generator.emitNode(m_subscript);
</del><ins>+ RefPtr<RegisterID> property = generator.emitNode(m_subscript);
</ins><span class="cx"> generator.emitExpressionInfo(divot(), divotStart(), divotEnd());
</span><del>- return generator.emitGetArgumentByVal(generator.finalDestination(dst), generator.uncheckedRegisterForArguments(), property);
</del><ins>+ return generator.emitGetArgumentByVal(generator.finalDestination(dst), generator.uncheckedRegisterForArguments(), property.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<RegisterID> base = generator.emitNodeForLeftHandSide(m_base, m_subscriptHasAssignments, m_subscript->isPure(generator));
</span><span class="lines">@@ -392,9 +392,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> nonArgumentsPath:
</span><del>- RegisterID* base = generator.emitNode(m_base);
</del><ins>+ RefPtr<RegisterID> base = generator.emitNode(m_base);
</ins><span class="cx"> generator.emitExpressionInfo(divot(), divotStart(), divotEnd());
</span><del>- return generator.emitGetById(generator.finalDestination(dst), base, m_ident);
</del><ins>+ return generator.emitGetById(generator.finalDestination(dst), base.get(), m_ident);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // ------------------------------ ArgumentListNode -----------------------------
</span><span class="lines">@@ -508,9 +508,9 @@
</span><span class="cx"> RegisterID* FunctionCallBracketNode::emitBytecode(BytecodeGenerator& generator, RegisterID* dst)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<RegisterID> base = generator.emitNode(m_base);
</span><del>- RegisterID* property = generator.emitNode(m_subscript);
</del><ins>+ RefPtr<RegisterID> property = generator.emitNode(m_subscript);
</ins><span class="cx"> generator.emitExpressionInfo(subexpressionDivot(), subexpressionStart(), subexpressionEnd());
</span><del>- RefPtr<RegisterID> function = generator.emitGetByVal(generator.tempDestination(dst), base.get(), property);
</del><ins>+ RefPtr<RegisterID> function = generator.emitGetByVal(generator.tempDestination(dst), base.get(), property.get());
</ins><span class="cx"> RefPtr<RegisterID> returnValue = generator.finalDestination(dst, function.get());
</span><span class="cx"> CallArguments callArguments(generator, m_args);
</span><span class="cx"> generator.emitMove(callArguments.thisRegister(), base.get());
</span><span class="lines">@@ -736,21 +736,21 @@
</span><span class="cx"> const Identifier& ident = resolve->identifier();
</span><span class="cx">
</span><span class="cx"> if (Local local = generator.local(ident)) {
</span><del>- RegisterID* localReg = local.get();
</del><ins>+ RefPtr<RegisterID> localReg = local.get();
</ins><span class="cx"> if (local.isReadOnly()) {
</span><span class="cx"> generator.emitReadOnlyExceptionIfNeeded();
</span><del>- localReg = generator.emitMove(generator.tempDestination(dst), localReg);
</del><ins>+ localReg = generator.emitMove(generator.tempDestination(dst), localReg.get());
</ins><span class="cx"> } else if (local.isCaptured()) {
</span><span class="cx"> RefPtr<RegisterID> tempDst = generator.finalDestination(dst);
</span><span class="cx"> ASSERT(dst != localReg);
</span><span class="cx"> RefPtr<RegisterID> tempDstSrc = generator.newTemporary();
</span><del>- generator.emitToNumber(tempDst.get(), localReg);
- generator.emitMove(tempDstSrc.get(), localReg);
</del><ins>+ generator.emitToNumber(tempDst.get(), localReg.get());
+ generator.emitMove(tempDstSrc.get(), localReg.get());
</ins><span class="cx"> emitIncOrDec(generator, tempDstSrc.get(), m_operator);
</span><del>- generator.emitMove(localReg, tempDstSrc.get());
</del><ins>+ generator.emitMove(localReg.get(), tempDstSrc.get());
</ins><span class="cx"> return tempDst.get();
</span><span class="cx"> }
</span><del>- return emitPostIncOrDec(generator, generator.finalDestination(dst), localReg, m_operator);
</del><ins>+ return emitPostIncOrDec(generator, generator.finalDestination(dst), localReg.get(), m_operator);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> generator.emitExpressionInfo(divot(), divotStart(), divotEnd());
</span><span class="lines">@@ -835,20 +835,20 @@
</span><span class="cx"> RegisterID* DeleteBracketNode::emitBytecode(BytecodeGenerator& generator, RegisterID* dst)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<RegisterID> r0 = generator.emitNode(m_base);
</span><del>- RegisterID* r1 = generator.emitNode(m_subscript);
</del><ins>+ RefPtr<RegisterID> r1 = generator.emitNode(m_subscript);
</ins><span class="cx">
</span><span class="cx"> generator.emitExpressionInfo(divot(), divotStart(), divotEnd());
</span><del>- return generator.emitDeleteByVal(generator.finalDestination(dst), r0.get(), r1);
</del><ins>+ return generator.emitDeleteByVal(generator.finalDestination(dst), r0.get(), r1.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // ------------------------------ DeleteDotNode -----------------------------------
</span><span class="cx">
</span><span class="cx"> RegisterID* DeleteDotNode::emitBytecode(BytecodeGenerator& generator, RegisterID* dst)
</span><span class="cx"> {
</span><del>- RegisterID* r0 = generator.emitNode(m_base);
</del><ins>+ RefPtr<RegisterID> r0 = generator.emitNode(m_base);
</ins><span class="cx">
</span><span class="cx"> generator.emitExpressionInfo(divot(), divotStart(), divotEnd());
</span><del>- return generator.emitDeleteById(generator.finalDestination(dst), r0, m_ident);
</del><ins>+ return generator.emitDeleteById(generator.finalDestination(dst), r0.get(), m_ident);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // ------------------------------ DeleteValueNode -----------------------------------
</span><span class="lines">@@ -911,19 +911,19 @@
</span><span class="cx"> const Identifier& ident = resolve->identifier();
</span><span class="cx">
</span><span class="cx"> if (Local local = generator.local(ident)) {
</span><del>- RegisterID* localReg = local.get();
</del><ins>+ RefPtr<RegisterID> localReg = local.get();
</ins><span class="cx"> if (local.isReadOnly()) {
</span><span class="cx"> generator.emitReadOnlyExceptionIfNeeded();
</span><del>- localReg = generator.emitMove(generator.tempDestination(dst), localReg);
</del><ins>+ localReg = generator.emitMove(generator.tempDestination(dst), localReg.get());
</ins><span class="cx"> } else if (local.isCaptured()) {
</span><span class="cx"> RefPtr<RegisterID> tempDst = generator.tempDestination(dst);
</span><del>- generator.emitMove(tempDst.get(), localReg);
</del><ins>+ generator.emitMove(tempDst.get(), localReg.get());
</ins><span class="cx"> emitIncOrDec(generator, tempDst.get(), m_operator);
</span><del>- generator.emitMove(localReg, tempDst.get());
</del><ins>+ generator.emitMove(localReg.get(), tempDst.get());
</ins><span class="cx"> return generator.moveToDestinationIfNeeded(dst, tempDst.get());
</span><span class="cx"> }
</span><del>- emitIncOrDec(generator, localReg, m_operator);
- return generator.moveToDestinationIfNeeded(dst, localReg);
</del><ins>+ emitIncOrDec(generator, localReg.get(), m_operator);
+ return generator.moveToDestinationIfNeeded(dst, localReg.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> generator.emitExpressionInfo(divot(), divotStart(), divotEnd());
</span><span class="lines">@@ -991,9 +991,9 @@
</span><span class="cx">
</span><span class="cx"> RegisterID* UnaryOpNode::emitBytecode(BytecodeGenerator& generator, RegisterID* dst)
</span><span class="cx"> {
</span><del>- RegisterID* src = generator.emitNode(m_expr);
</del><ins>+ RefPtr<RegisterID> src = generator.emitNode(m_expr);
</ins><span class="cx"> generator.emitExpressionInfo(position(), position(), position());
</span><del>- return generator.emitUnaryOp(opcodeID(), generator.finalDestination(dst), src);
</del><ins>+ return generator.emitUnaryOp(opcodeID(), generator.finalDestination(dst), src.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // ------------------------------ BitwiseNotNode -----------------------------------
</span><span class="lines">@@ -1001,8 +1001,8 @@
</span><span class="cx"> RegisterID* BitwiseNotNode::emitBytecode(BytecodeGenerator& generator, RegisterID* dst)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<RegisterID> src2 = generator.emitLoad(generator.newTemporary(), jsNumber(-1));
</span><del>- RegisterID* src1 = generator.emitNode(m_expr);
- return generator.emitBinaryOp(op_bitxor, generator.finalDestination(dst, src1), src1, src2.get(), OperandTypes(m_expr->resultDescriptor(), ResultType::numberTypeIsInt32()));
</del><ins>+ RefPtr<RegisterID> src1 = generator.emitNode(m_expr);
+ return generator.emitBinaryOp(op_bitxor, generator.finalDestination(dst, src1.get()), src1.get(), src2.get(), OperandTypes(m_expr->resultDescriptor(), ResultType::numberTypeIsInt32()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // ------------------------------ LogicalNotNode -----------------------------------
</span><span class="lines">@@ -1217,19 +1217,19 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<RegisterID> src1 = generator.emitNodeForLeftHandSide(left, m_rightHasAssignments, right->isPure(generator));
</span><span class="cx"> bool wasTypeof = generator.m_lastOpcodeID == op_typeof;
</span><del>- RegisterID* src2 = generator.emitNode(right);
</del><ins>+ RefPtr<RegisterID> src2 = generator.emitNode(right);
</ins><span class="cx"> generator.emitExpressionInfo(position(), position(), position());
</span><span class="cx"> if (wasTypeof && (opcodeID == op_neq || opcodeID == op_nstricteq)) {
</span><span class="cx"> RefPtr<RegisterID> tmp = generator.tempDestination(dst);
</span><span class="cx"> if (opcodeID == op_neq)
</span><del>- generator.emitEqualityOp(op_eq, generator.finalDestination(tmp.get(), src1.get()), src1.get(), src2);
</del><ins>+ generator.emitEqualityOp(op_eq, generator.finalDestination(tmp.get(), src1.get()), src1.get(), src2.get());
</ins><span class="cx"> else if (opcodeID == op_nstricteq)
</span><del>- generator.emitEqualityOp(op_stricteq, generator.finalDestination(tmp.get(), src1.get()), src1.get(), src2);
</del><ins>+ generator.emitEqualityOp(op_stricteq, generator.finalDestination(tmp.get(), src1.get()), src1.get(), src2.get());
</ins><span class="cx"> else
</span><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><span class="cx"> return generator.emitUnaryOp(op_not, generator.finalDestination(dst, tmp.get()), tmp.get());
</span><span class="cx"> }
</span><del>- RegisterID* result = generator.emitBinaryOp(opcodeID, generator.finalDestination(dst, src1.get()), src1.get(), src2, OperandTypes(left->resultDescriptor(), right->resultDescriptor()));
</del><ins>+ RegisterID* result = generator.emitBinaryOp(opcodeID, generator.finalDestination(dst, src1.get()), src1.get(), src2.get(), OperandTypes(left->resultDescriptor(), right->resultDescriptor()));
</ins><span class="cx"> if (opcodeID == op_urshift && dst != generator.ignoredResult())
</span><span class="cx"> return generator.emitUnaryOp(op_unsigned, result, result);
</span><span class="cx"> return result;
</span><span class="lines">@@ -1249,8 +1249,8 @@
</span><span class="cx"> std::swap(left, right);
</span><span class="cx">
</span><span class="cx"> RefPtr<RegisterID> src1 = generator.emitNodeForLeftHandSide(left, m_rightHasAssignments, m_expr2->isPure(generator));
</span><del>- RegisterID* src2 = generator.emitNode(right);
- return generator.emitEqualityOp(op_eq, generator.finalDestination(dst, src1.get()), src1.get(), src2);
</del><ins>+ RefPtr<RegisterID> src2 = generator.emitNode(right);
+ return generator.emitEqualityOp(op_eq, generator.finalDestination(dst, src1.get()), src1.get(), src2.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RegisterID* StrictEqualNode::emitBytecode(BytecodeGenerator& generator, RegisterID* dst)
</span><span class="lines">@@ -1261,16 +1261,16 @@
</span><span class="cx"> std::swap(left, right);
</span><span class="cx">
</span><span class="cx"> RefPtr<RegisterID> src1 = generator.emitNodeForLeftHandSide(left, m_rightHasAssignments, m_expr2->isPure(generator));
</span><del>- RegisterID* src2 = generator.emitNode(right);
- return generator.emitEqualityOp(op_stricteq, generator.finalDestination(dst, src1.get()), src1.get(), src2);
</del><ins>+ RefPtr<RegisterID> src2 = generator.emitNode(right);
+ return generator.emitEqualityOp(op_stricteq, generator.finalDestination(dst, src1.get()), src1.get(), src2.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RegisterID* ThrowableBinaryOpNode::emitBytecode(BytecodeGenerator& generator, RegisterID* dst)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<RegisterID> src1 = generator.emitNodeForLeftHandSide(m_expr1, m_rightHasAssignments, m_expr2->isPure(generator));
</span><del>- RegisterID* src2 = generator.emitNode(m_expr2);
</del><ins>+ RefPtr<RegisterID> src2 = generator.emitNode(m_expr2);
</ins><span class="cx"> generator.emitExpressionInfo(divot(), divotStart(), divotEnd());
</span><del>- return generator.emitBinaryOp(opcodeID(), generator.finalDestination(dst, src1.get()), src1.get(), src2, OperandTypes(m_expr1->resultDescriptor(), m_expr2->resultDescriptor()));
</del><ins>+ return generator.emitBinaryOp(opcodeID(), generator.finalDestination(dst, src1.get()), src1.get(), src2.get(), OperandTypes(m_expr1->resultDescriptor(), m_expr2->resultDescriptor()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RegisterID* InstanceOfNode::emitBytecode(BytecodeGenerator& generator, RegisterID* dst)
</span><span class="lines">@@ -1469,9 +1469,9 @@
</span><span class="cx"> {
</span><span class="cx"> RefPtr<RegisterID> base = generator.emitNodeForLeftHandSide(m_base, m_rightHasAssignments, m_right->isPure(generator));
</span><span class="cx"> RefPtr<RegisterID> value = generator.destinationForAssignResult(dst);
</span><del>- RegisterID* result = generator.emitNode(value.get(), m_right);
</del><ins>+ RefPtr<RegisterID> result = generator.emitNode(value.get(), m_right);
</ins><span class="cx"> generator.emitExpressionInfo(divot(), divotStart(), divotEnd());
</span><del>- RegisterID* forwardResult = (dst == generator.ignoredResult()) ? result : generator.moveToDestinationIfNeeded(generator.tempDestination(result), result);
</del><ins>+ RegisterID* forwardResult = (dst == generator.ignoredResult()) ? result.get() : generator.moveToDestinationIfNeeded(generator.tempDestination(result.get()), result.get());
</ins><span class="cx"> generator.emitPutById(base.get(), m_ident, forwardResult);
</span><span class="cx"> return generator.moveToDestinationIfNeeded(dst, forwardResult);
</span><span class="cx"> }
</span><span class="lines">@@ -1504,10 +1504,10 @@
</span><span class="cx"> RefPtr<RegisterID> base = generator.emitNodeForLeftHandSide(m_base, m_subscriptHasAssignments || m_rightHasAssignments, m_subscript->isPure(generator) && m_right->isPure(generator));
</span><span class="cx"> RefPtr<RegisterID> property = generator.emitNodeForLeftHandSide(m_subscript, m_rightHasAssignments, m_right->isPure(generator));
</span><span class="cx"> RefPtr<RegisterID> value = generator.destinationForAssignResult(dst);
</span><del>- RegisterID* result = generator.emitNode(value.get(), m_right);
</del><ins>+ RefPtr<RegisterID> result = generator.emitNode(value.get(), m_right);
</ins><span class="cx">
</span><span class="cx"> generator.emitExpressionInfo(divot(), divotStart(), divotEnd());
</span><del>- RegisterID* forwardResult = (dst == generator.ignoredResult()) ? result : generator.moveToDestinationIfNeeded(generator.tempDestination(result), result);
</del><ins>+ RegisterID* forwardResult = (dst == generator.ignoredResult()) ? result.get() : generator.moveToDestinationIfNeeded(generator.tempDestination(result.get()), result.get());
</ins><span class="cx"> generator.emitPutByVal(base.get(), property.get(), forwardResult);
</span><span class="cx"> return generator.moveToDestinationIfNeeded(dst, forwardResult);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>