Deep copy CapturedValues to GlobOptBlockData when an instruction with a bailout gets hoisted

rajatd · rajatd · commit 0e0763e39145 · 2017-12-27T16:33:07.000-08:00
diff --git a/lib/Backend/GlobOpt.cpp b/lib/Backend/GlobOpt.cpp
@@ -16733,7 +16733,7 @@ GlobOpt::OptHoistInvariant(
         EnsureBailTarget(loop);
 
         // Copy bailout info of loop top.
-        instr->ReplaceBailOutInfo(loop->bailOutInfo);
+        instr->ReplaceBailOutInfo(loop->bailOutInfo, this->currentBlock);
     }
 
     if(!dst)
diff --git a/lib/Backend/GlobOptBlockData.cpp b/lib/Backend/GlobOptBlockData.cpp
@@ -1940,6 +1940,12 @@ GlobOptBlockData::KillStateForGeneratorYield()
     this->hasCSECandidates = false;
 }
 
+JitArenaAllocator *
+GlobOptBlockData::GetGlobOptAllocator()
+{
+    return this->globOpt->alloc;
+}
+
 #if DBG_DUMP
 void
 GlobOptBlockData::DumpSymToValueMap() const
diff --git a/lib/Backend/GlobOptBlockData.h b/lib/Backend/GlobOptBlockData.h
@@ -349,6 +349,7 @@ class GlobOptBlockData
     // Other
 public:
     void                    KillStateForGeneratorYield();
+    JitArenaAllocator *     GetGlobOptAllocator();
 
     // Debug
 public:
diff --git a/lib/Backend/IR.cpp b/lib/Backend/IR.cpp
@@ -1153,11 +1153,10 @@ Instr::UnlinkBailOutInfo()
     return bailOutInfo;
 }
 
-bool
-Instr::ReplaceBailOutInfo(BailOutInfo *newBailOutInfo)
+void
+Instr::ReplaceBailOutInfo(BailOutInfo *newBailOutInfo, BasicBlock * block)
 {
     BailOutInfo *oldBailOutInfo = nullptr;
-    bool deleteOld = false;
 
 #if DBG
     newBailOutInfo->wasCopied = true;
@@ -1187,12 +1186,17 @@ Instr::ReplaceBailOutInfo(BailOutInfo *newBailOutInfo)
     if (oldBailOutInfo->bailOutInstr == this)
     {
         JitArenaAllocator * alloc = this->m_func->m_alloc;
+        // If the oldBailOutInfo's captured values were cached on the globopt-block-data,
+        // make a deep copy of the lists in the captured values on the block data.
+        if (block && block->globOptData.capturedValuesCandidate == &oldBailOutInfo->capturedValues)
+        {
+            block->globOptData.capturedValuesCandidate = oldBailOutInfo->capturedValues.Clone(block->globOptData.GetGlobOptAllocator());
+        }
         oldBailOutInfo->Clear(alloc);
         JitAdelete(alloc, oldBailOutInfo);
-        deleteOld = true;
     }
 
-    return deleteOld;
+    return;
 }
 
 IR::Instr *Instr::ShareBailOut()
@@ -3145,7 +3149,7 @@ Instr::ConvertToBailOutInstr(BailOutInfo * bailOutInfo, IR::BailOutKind kind, bo
         this->SetBailOutKind_NoAssert(kind);
 
         // Clear old (aux) info and set to the new bailOutInfo.
-        this->ReplaceBailOutInfo(bailOutInfo);
+        this->ReplaceBailOutInfo(bailOutInfo, nullptr);
         bailOutInfo->bailOutInstr = this;
         this->hasBailOutInfo = true;
 
diff --git a/lib/Backend/IR.h b/lib/Backend/IR.h
@@ -36,6 +36,19 @@ struct CapturedValues
         constantValues.Reset();
         copyPropSyms.Reset();
     }
+
+    CapturedValues * Clone(JitArenaAllocator * alloc)
+    {
+        CapturedValues * clonedCV = JitAnew(alloc, CapturedValues);
+        this->constantValues.CopyTo(alloc, clonedCV->constantValues);
+        this->copyPropSyms.CopyTo(alloc, clonedCV->copyPropSyms);
+        if (this->argObjSyms)
+        {
+            clonedCV->argObjSyms = JitAnew(alloc, BVSparse<JitArenaAllocator>, alloc);
+            clonedCV->argObjSyms->Copy(this->argObjSyms);
+        }
+        return clonedCV;
+    }
 };
 
 class LoweredBasicBlock;
@@ -317,7 +330,7 @@ class Instr
 
     BailOutInfo *   GetBailOutInfo() const;
     BailOutInfo *   UnlinkBailOutInfo();
-    bool            ReplaceBailOutInfo(BailOutInfo *newBailOutInfo);
+    void            ReplaceBailOutInfo(BailOutInfo *newBailOutInfo, BasicBlock * block);
     IR::Instr *     ShareBailOut();
     BailOutKind     GetBailOutKind() const;
     BailOutKind     GetBailOutKindNoBits() const;

Original file line number	Diff line number	Diff line change
`@@ -16733,7 +16733,7 @@ GlobOpt::OptHoistInvariant(`
`16733`	`16733`	`EnsureBailTarget(loop);`
`16734`	`16734`
`16735`	`16735`	`// Copy bailout info of loop top.`
`16736`		`- instr->ReplaceBailOutInfo(loop->bailOutInfo);`
	`16736`	`+ instr->ReplaceBailOutInfo(loop->bailOutInfo, this->currentBlock);`
`16737`	`16737`	`}`
`16738`	`16738`
`16739`	`16739`	`if(!dst)`