deps: update ChakraCore to chakra-core/ChakraCore@965f77965c

meg-gupta · chakrabot · commit e41955f8b7a6 · 2018-02-02T03:05:41.000-08:00
[1.8>1.9] [MERGE #4627 @meg-gupta] Fix missed copyprop opportunity due to unhandled InitFld case Merge pull request #4627 from meg-gupta:fixopt ```var num = 50; function inlineCall(tnum) { return {x : tnum}; // InitFld } function foo (obj) { var tnum = num; var sum = 0; while (tnum >= 0) { var retObj = inlineCall(tnum); if (tnum > 10) { sum += retObj.x; // missed copy prop opportunity } tnum--; } return sum; } var obj = {}; foo(obj); foo(obj); foo(obj) ``` We were not setting a property initialized from InitFld instruction on the liveFields bit vector, this led to returning null valueInfo when we queried through GlobOptBlockData::FindPropertyValue, because that function checks if the property is live first and then queries its valauenumber from the symToValue map. This pattern comes up in forof on array iterators, the constructor returns an object literal and we miss copy proping Reviewed-By: chakrabot <chakrabot@users.noreply.github.com>
diff --git a/deps/chakrashim/core/lib/Backend/GlobOpt.cpp b/deps/chakrashim/core/lib/Backend/GlobOpt.cpp
@@ -3662,7 +3662,6 @@ GlobOpt::CopyProp(IR::Opnd *opnd, IR::Instr *instr, Value *val, IR::IndirOpnd *p
 
     ValueInfo *valueInfo = val->GetValueInfo();
 
-
     if (this->func->HasFinally())
     {
         // s0 = undefined was added on functions with early exit in try-finally functions, that can get copy-proped and case incorrect results
@@ -4847,6 +4846,8 @@ GlobOpt::ValueNumberDst(IR::Instr **pInstr, Value *src1Val, Value *src2Val)
     case Js::OpCode::StRootFld:
     case Js::OpCode::StFldStrict:
     case Js::OpCode::StRootFldStrict:
+    case Js::OpCode::InitFld:
+    case Js::OpCode::InitComputedProperty:
         if (DoFieldCopyProp())
         {
             if (src1Val == nullptr)
diff --git a/deps/chakrashim/core/lib/Backend/GlobOptFields.cpp b/deps/chakrashim/core/lib/Backend/GlobOptFields.cpp
@@ -473,6 +473,10 @@ GlobOpt::ProcessFieldKills(IR::Instr *instr, BVSparse<JitArenaAllocator> *bv, bo
         KillLiveElems(dstOpnd->AsIndirOpnd(), bv, inGlobOpt, instr->m_func);
         break;
 
+    case Js::OpCode::InitComputedProperty:
+        KillLiveElems(dstOpnd->AsIndirOpnd(), bv, inGlobOpt, instr->m_func);
+        break;
+
     case Js::OpCode::DeleteElemI_A:
     case Js::OpCode::DeleteElemIStrict_A:
         Assert(dstOpnd != nullptr);
@@ -504,7 +508,7 @@ GlobOpt::ProcessFieldKills(IR::Instr *instr, BVSparse<JitArenaAllocator> *bv, bo
             this->KillAllObjectTypes(bv);
         }
         break;
-
+    case Js::OpCode::InitFld:
     case Js::OpCode::StFld:
     case Js::OpCode::StRootFld:
     case Js::OpCode::StFldStrict:

Original file line number	Diff line number	Diff line change
`@@ -3662,7 +3662,6 @@ GlobOpt::CopyProp(IR::Opnd opnd, IR::Instr instr, Value val, IR::IndirOpnd p`
`3662`	`3662`
`3663`	`3663`	`ValueInfo *valueInfo = val->GetValueInfo();`
`3664`	`3664`
`3665`		`-`
`3666`	`3665`	`if (this->func->HasFinally())`
`3667`	`3666`	`{`
`3668`	`3667`	`// s0 = undefined was added on functions with early exit in try-finally functions, that can get copy-proped and case incorrect results`
`@@ -4847,6 +4846,8 @@ GlobOpt::ValueNumberDst(IR::Instr *pInstr, Value src1Val, Value *src2Val)`
`4847`	`4846`	`case Js::OpCode::StRootFld:`
`4848`	`4847`	`case Js::OpCode::StFldStrict:`
`4849`	`4848`	`case Js::OpCode::StRootFldStrict:`
	`4849`	`+ case Js::OpCode::InitFld:`
	`4850`	`+ case Js::OpCode::InitComputedProperty:`
`4850`	`4851`	`if (DoFieldCopyProp())`
`4851`	`4852`	`{`
`4852`	`4853`	`if (src1Val == nullptr)`