CR feedback

rajatd · rajatd · commit e77fd8bc63f8 · 2017-12-28T11:21:28.000-08:00
diff --git a/lib/Backend/IR.cpp b/lib/Backend/IR.cpp
@@ -1186,14 +1186,13 @@ Instr::ReplaceBailOutInfo(BailOutInfo *newBailOutInfo, BasicBlock * block)
     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)
+        // If the oldBailOutInfo's captured values were cached on the globopt-block-data, don't
+        // delete the old bailout info. It will eventually be freed when we're done jitting this function.
+        if (!(block && block->globOptData.capturedValuesCandidate == &oldBailOutInfo->capturedValues))
         {
-            block->globOptData.capturedValuesCandidate = oldBailOutInfo->capturedValues.Clone(block->globOptData.GetGlobOptAllocator());
+            oldBailOutInfo->Clear(alloc);
+            JitAdelete(alloc, oldBailOutInfo);
         }
-        oldBailOutInfo->Clear(alloc);
-        JitAdelete(alloc, oldBailOutInfo);
     }
 
     return;

Original file line number	Diff line number	Diff line change
`@@ -1186,14 +1186,13 @@ Instr::ReplaceBailOutInfo(BailOutInfo newBailOutInfo, BasicBlock block)`
`1186`	`1186`	`if (oldBailOutInfo->bailOutInstr == this)`
`1187`	`1187`	`{`
`1188`	`1188`	`JitArenaAllocator * alloc = this->m_func->m_alloc;`
`1189`		`- // If the oldBailOutInfo's captured values were cached on the globopt-block-data,`
`1190`		`- // make a deep copy of the lists in the captured values on the block data.`
`1191`		`- if (block && block->globOptData.capturedValuesCandidate == &oldBailOutInfo->capturedValues)`
	`1189`	`+ // If the oldBailOutInfo's captured values were cached on the globopt-block-data, don't`
	`1190`	`+ // delete the old bailout info. It will eventually be freed when we're done jitting this function.`
	`1191`	`+ if (!(block && block->globOptData.capturedValuesCandidate == &oldBailOutInfo->capturedValues))`
`1192`	`1192`	`{`
`1193`		`- block->globOptData.capturedValuesCandidate = oldBailOutInfo->capturedValues.Clone(block->globOptData.GetGlobOptAllocator());`
	`1193`	`+ oldBailOutInfo->Clear(alloc);`
	`1194`	`+ JitAdelete(alloc, oldBailOutInfo);`
`1194`	`1195`	`}`
`1195`		`- oldBailOutInfo->Clear(alloc);`
`1196`		`- JitAdelete(alloc, oldBailOutInfo);`
`1197`	`1196`	`}`
`1198`	`1197`
`1199`	`1198`	`return;`