Copy prop for argument sym at InlineeEnd should check if the copy-pro…

…p candidate is live at InlineeStart
chakra-core · May 7, 2018 · 1ee5250 · 1ee5250
1 parent c452be1
commit 1ee5250
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/lib/Backend/GlobOptBailOut.cpp b/lib/Backend/GlobOptBailOut.cpp
@@ -558,8 +558,9 @@ GlobOpt::TrackCalls(IR::Instr * instr)
             instr->m_func->m_hasInlineArgsOpt = true;
             InlineeFrameInfo* frameInfo = InlineeFrameInfo::New(func->m_alloc);
             instr->m_func->frameInfo = frameInfo;
-            frameInfo->floatSyms = currentBlock->globOptData.liveFloat64Syms->CopyNew(this->alloc);
-            frameInfo->intSyms = currentBlock->globOptData.liveInt32Syms->MinusNew(currentBlock->globOptData.liveLossyInt32Syms, this->alloc);
+            frameInfo->floatSyms = CurrentBlockData()->liveFloat64Syms->CopyNew(this->alloc);
+            frameInfo->intSyms = CurrentBlockData()->liveInt32Syms->MinusNew(CurrentBlockData()->liveLossyInt32Syms, this->alloc);
+            frameInfo->varSyms = CurrentBlockData()->liveVarSyms->CopyNew(this->alloc);
         }
         break;
 
@@ -769,7 +770,8 @@ void GlobOpt::RecordInlineeFrameInfo(IR::Instr* inlineeEnd)
                     if (value)
                     {
                         StackSym * copyPropSym = this->currentBlock->globOptData.GetCopyPropSym(argSym, value);
-                        if (copyPropSym)
+                        if (copyPropSym &&
+                            frameInfo->varSyms->TestEmpty() && frameInfo->varSyms->Test(copyPropSym->m_id))
                         {
                             argSym = copyPropSym;
                         }
@@ -814,6 +816,8 @@ void GlobOpt::RecordInlineeFrameInfo(IR::Instr* inlineeEnd)
     frameInfo->intSyms = nullptr;
     JitAdelete(this->alloc, frameInfo->floatSyms);
     frameInfo->floatSyms = nullptr;
+    JitAdelete(this->alloc, frameInfo->varSyms);
+    frameInfo->varSyms = nullptr;
     frameInfo->isRecorded = true;
 }
 

diff --git a/lib/Backend/InlineeFrameInfo.h b/lib/Backend/InlineeFrameInfo.h
@@ -149,6 +149,7 @@ struct InlineeFrameInfo
     InlineeFrameRecord* record;
     BVSparse<JitArenaAllocator>* floatSyms;
     BVSparse<JitArenaAllocator>* intSyms;
+    BVSparse<JitArenaAllocator>* varSyms;
 
     bool isRecorded;