[MERGE #5785 @nhat-nguyen] Change usedCapturedValues in BailOutInfo to a pointer for consistency

nhat-nguyen · nhat-nguyen · commit 2b6e9a2f4625 · 2018-10-30T14:09:51.000-07:00
Merge pull request #5785 from nhat-nguyen:usedCapturedValues As part of `LazyBailOut`, we want to perform a *shallow* copy of a `BailOutInfo` which includes sharing all field pointers. However, `usedCapturedValues` is the only field in `BailOutInfo` that is not a pointer and is initialized together with `CapturedValues`, which makes it more complicated to do so as we have to perform manual copy of each field inside `CapturedValues`. With this change, we are more consistent with what we already have and also make it easier for future `LazyBailOut` work.
diff --git a/lib/Backend/BackwardPass.cpp b/lib/Backend/BackwardPass.cpp
@@ -1716,19 +1716,19 @@ BackwardPass::ProcessBailOutArgObj(BailOutInfo * bailOutInfo, BVSparse<JitArenaA
         {
             if (byteCodeUpwardExposedUsed->TestAndClear(symId))
             {
-                if (bailOutInfo->usedCapturedValues.argObjSyms == nullptr)
+                if (bailOutInfo->usedCapturedValues->argObjSyms == nullptr)
                 {
-                    bailOutInfo->usedCapturedValues.argObjSyms = JitAnew(this->func->m_alloc,
+                    bailOutInfo->usedCapturedValues->argObjSyms = JitAnew(this->func->m_alloc,
                         BVSparse<JitArenaAllocator>, this->func->m_alloc);
                 }
-                bailOutInfo->usedCapturedValues.argObjSyms->Set(symId);
+                bailOutInfo->usedCapturedValues->argObjSyms->Set(symId);
             }
         }
         NEXT_BITSET_IN_SPARSEBV;
     }
-    if (bailOutInfo->usedCapturedValues.argObjSyms)
+    if (bailOutInfo->usedCapturedValues->argObjSyms)
     {
-        byteCodeUpwardExposedUsed->Minus(bailOutInfo->usedCapturedValues.argObjSyms);
+        byteCodeUpwardExposedUsed->Minus(bailOutInfo->usedCapturedValues->argObjSyms);
     }
 }
 
@@ -1738,7 +1738,7 @@ BackwardPass::ProcessBailOutConstants(BailOutInfo * bailOutInfo, BVSparse<JitAre
     Assert(this->tag != Js::BackwardPhase);
 
     // Remove constants that we are already going to restore
-    SListBase<ConstantStackSymValue> * usedConstantValues = &bailOutInfo->usedCapturedValues.constantValues;
+    SListBase<ConstantStackSymValue> * usedConstantValues = &bailOutInfo->usedCapturedValues->constantValues;
     FOREACH_SLISTBASE_ENTRY(ConstantStackSymValue, value, usedConstantValues)
     {
         byteCodeUpwardExposedUsed->Clear(value.Key()->m_id);
@@ -1770,7 +1770,7 @@ BackwardPass::ProcessBailOutCopyProps(BailOutInfo * bailOutInfo, BVSparse<JitAre
     Assert(!this->func->GetJITFunctionBody()->IsAsmJsMode());
 
     // Remove copy prop that we were already going to restore
-    SListBase<CopyPropSyms> * usedCopyPropSyms = &bailOutInfo->usedCapturedValues.copyPropSyms;
+    SListBase<CopyPropSyms> * usedCopyPropSyms = &bailOutInfo->usedCapturedValues->copyPropSyms;
     FOREACH_SLISTBASE_ENTRY(CopyPropSyms, copyPropSyms, usedCopyPropSyms)
     {
         byteCodeUpwardExposedUsed->Clear(copyPropSyms.Key()->m_id);
@@ -2602,7 +2602,7 @@ BackwardPass::ProcessBailOutInfo(IR::Instr * instr, BailOutInfo * bailOutInfo)
             tempBv->And(this->func->m_nonTempLocalVars, bailOutInfo->liveVarSyms);
 
             // Remove syms that are restored in other ways than byteCodeUpwardExposedUsed.
-            FOREACH_SLIST_ENTRY(ConstantStackSymValue, value, &bailOutInfo->usedCapturedValues.constantValues)
+            FOREACH_SLIST_ENTRY(ConstantStackSymValue, value, &bailOutInfo->usedCapturedValues->constantValues)
             {
                 Assert(value.Key()->HasByteCodeRegSlot() || value.Key()->GetInstrDef()->m_opcode == Js::OpCode::BytecodeArgOutCapture);
                 if (value.Key()->HasByteCodeRegSlot())
@@ -2611,7 +2611,7 @@ BackwardPass::ProcessBailOutInfo(IR::Instr * instr, BailOutInfo * bailOutInfo)
                 }
             }
             NEXT_SLIST_ENTRY;
-            FOREACH_SLIST_ENTRY(CopyPropSyms, value, &bailOutInfo->usedCapturedValues.copyPropSyms)
+            FOREACH_SLIST_ENTRY(CopyPropSyms, value, &bailOutInfo->usedCapturedValues->copyPropSyms)
             {
                 Assert(value.Key()->HasByteCodeRegSlot() || value.Key()->GetInstrDef()->m_opcode == Js::OpCode::BytecodeArgOutCapture);
                 if (value.Key()->HasByteCodeRegSlot())
@@ -2620,9 +2620,9 @@ BackwardPass::ProcessBailOutInfo(IR::Instr * instr, BailOutInfo * bailOutInfo)
                 }
             }
             NEXT_SLIST_ENTRY;
-            if (bailOutInfo->usedCapturedValues.argObjSyms)
+            if (bailOutInfo->usedCapturedValues->argObjSyms)
             {
-                tempBv->Minus(bailOutInfo->usedCapturedValues.argObjSyms);
+                tempBv->Minus(bailOutInfo->usedCapturedValues->argObjSyms);
             }
 
             byteCodeUpwardExposedUsed->Or(tempBv);
@@ -8326,7 +8326,7 @@ BackwardPass::ReverseCopyProp(IR::Instr *instr)
             FOREACH_SLISTBASE_ENTRY(
                 CopyPropSyms,
                 usedCopyPropSym,
-                &instrPrev->GetBailOutInfo()->usedCapturedValues.copyPropSyms)
+                &instrPrev->GetBailOutInfo()->usedCapturedValues->copyPropSyms)
             {
                 if(dstSym == usedCopyPropSym.Value())
                 {
diff --git a/lib/Backend/BailOut.cpp b/lib/Backend/BailOut.cpp
@@ -30,8 +30,21 @@ BailOutInfo::Clear(JitArenaAllocator * allocator)
 
         JitAdelete(allocator, this->capturedValues);
     }
-    this->usedCapturedValues.constantValues.Clear(allocator);
-    this->usedCapturedValues.copyPropSyms.Clear(allocator);
+
+    if (this->usedCapturedValues)
+    {
+        Assert(this->usedCapturedValues->refCount == 0);
+        this->usedCapturedValues->constantValues.Clear(allocator);
+        this->usedCapturedValues->copyPropSyms.Clear(allocator);
+
+        if (this->usedCapturedValues->argObjSyms)
+        {
+            JitAdelete(allocator, this->usedCapturedValues->argObjSyms);
+        }
+
+        JitAdelete(allocator, this->usedCapturedValues);
+    }
+
     if (byteCodeUpwardExposedUsed)
     {
         JitAdelete(allocator, byteCodeUpwardExposedUsed);
diff --git a/lib/Backend/BailOut.h b/lib/Backend/BailOut.h
@@ -41,7 +41,9 @@ class BailOutInfo
 #endif
         this->capturedValues = JitAnew(bailOutFunc->m_alloc, CapturedValues);
         this->capturedValues->refCount = 1;
-        this->usedCapturedValues.argObjSyms = nullptr;
+
+        this->usedCapturedValues = JitAnew(bailOutFunc->m_alloc, CapturedValues);
+        this->usedCapturedValues->argObjSyms = nullptr;
     }
     void Clear(JitArenaAllocator * allocator);
 
@@ -77,9 +79,9 @@ class BailOutInfo
 #endif
     uint32 bailOutOffset;
     BailOutRecord * bailOutRecord;
-    CapturedValues* capturedValues;                                      // Values we know about after forward pass
-    CapturedValues usedCapturedValues;                                  // Values that need to be restored in the bail out
-    BVSparse<JitArenaAllocator> * byteCodeUpwardExposedUsed;            // Non-constant stack syms that needs to be restored in the bail out
+    CapturedValues * capturedValues;                                      // Values we know about after forward pass
+    CapturedValues * usedCapturedValues;                                  // Values that need to be restored in the bail out
+    BVSparse<JitArenaAllocator> * byteCodeUpwardExposedUsed;              // Non-constant stack syms that needs to be restored in the bail out
     uint polymorphicCacheIndex;
     uint startCallCount;
     uint totalOutParamCount;
diff --git a/lib/Backend/LinearScan.cpp b/lib/Backend/LinearScan.cpp
@@ -1417,7 +1417,7 @@ LinearScan::FillBailOutRecord(IR::Instr * instr)
     memset(state.registerSaveSyms, 0, sizeof(state.registerSaveSyms));
 
     // Fill in the constants
-    FOREACH_SLISTBASE_ENTRY_EDITING(ConstantStackSymValue, value, &bailOutInfo->usedCapturedValues.constantValues, constantValuesIterator)
+    FOREACH_SLISTBASE_ENTRY_EDITING(ConstantStackSymValue, value, &bailOutInfo->usedCapturedValues->constantValues, constantValuesIterator)
     {
         AssertMsg(bailOutInfo->bailOutRecord->bailOutKind != IR::BailOutForGeneratorYield, "constant prop syms unexpected for bail-in for generator yield");
         StackSym * stackSym = value.Key();
@@ -1460,7 +1460,7 @@ LinearScan::FillBailOutRecord(IR::Instr * instr)
     NEXT_SLISTBASE_ENTRY_EDITING;
 
     // Fill in the copy prop syms
-    FOREACH_SLISTBASE_ENTRY_EDITING(CopyPropSyms, copyPropSyms, &bailOutInfo->usedCapturedValues.copyPropSyms, copyPropSymsIter)
+    FOREACH_SLISTBASE_ENTRY_EDITING(CopyPropSyms, copyPropSyms, &bailOutInfo->usedCapturedValues->copyPropSyms, copyPropSymsIter)
     {
         AssertMsg(bailOutInfo->bailOutRecord->bailOutKind != IR::BailOutForGeneratorYield, "copy prop syms unexpected for bail-in for generator yield");
         StackSym * stackSym = copyPropSyms.Key();
@@ -1513,9 +1513,9 @@ LinearScan::FillBailOutRecord(IR::Instr * instr)
     }
     NEXT_BITSET_IN_SPARSEBV;
 
-    if (bailOutInfo->usedCapturedValues.argObjSyms)
+    if (bailOutInfo->usedCapturedValues->argObjSyms)
     {
-        FOREACH_BITSET_IN_SPARSEBV(id, bailOutInfo->usedCapturedValues.argObjSyms)
+        FOREACH_BITSET_IN_SPARSEBV(id, bailOutInfo->usedCapturedValues->argObjSyms)
         {
             StackSym * stackSym = this->func->m_symTable->FindStackSym(id);
             Assert(stackSym != nullptr);
@@ -1705,7 +1705,7 @@ LinearScan::FillBailOutRecord(IR::Instr * instr)
                 uint outParamOffsetIndex = outParamStart + argSlot;
                 if (!sym->m_isBailOutReferenced && !sym->IsArgSlotSym())
                 {
-                    FOREACH_SLISTBASE_ENTRY_EDITING(ConstantStackSymValue, constantValue, &bailOutInfo->usedCapturedValues.constantValues, iterator)
+                    FOREACH_SLISTBASE_ENTRY_EDITING(ConstantStackSymValue, constantValue, &bailOutInfo->usedCapturedValues->constantValues, iterator)
                     {
                         if (constantValue.Key()->m_id == sym->m_id)
                         {
@@ -1731,13 +1731,13 @@ LinearScan::FillBailOutRecord(IR::Instr * instr)
                         continue;
                     }
 
-                    FOREACH_SLISTBASE_ENTRY_EDITING(CopyPropSyms, copyPropSym, &bailOutInfo->usedCapturedValues.copyPropSyms, iter)
+                    FOREACH_SLISTBASE_ENTRY_EDITING(CopyPropSyms, copyPropSym, &bailOutInfo->usedCapturedValues->copyPropSyms, iter)
                     {
                         if (copyPropSym.Key()->m_id == sym->m_id)
                         {
                             StackSym * copyStackSym = copyPropSym.Value();
 
-                            BVSparse<JitArenaAllocator>* argObjSyms = bailOutInfo->usedCapturedValues.argObjSyms;
+                            BVSparse<JitArenaAllocator>* argObjSyms = bailOutInfo->usedCapturedValues->argObjSyms;
                             if (argObjSyms && argObjSyms->Test(copyStackSym->m_id))
                             {
                                 outParamOffsets[outParamOffsetIndex] = BailOutRecord::GetArgumentsObjectOffset();
@@ -1845,7 +1845,7 @@ LinearScan::FillBailOutRecord(IR::Instr * instr)
                                     Assert(LowererMD::IsAssign(instrDef));
                                 }
 
-                                if (bailOutInfo->usedCapturedValues.argObjSyms && bailOutInfo->usedCapturedValues.argObjSyms->Test(sym->m_id))
+                                if (bailOutInfo->usedCapturedValues->argObjSyms && bailOutInfo->usedCapturedValues->argObjSyms->Test(sym->m_id))
                                 {
                                     //foo.apply(this,arguments) case and we bailout when the apply is overridden. We need to restore the arguments object.
                                     outParamOffsets[outParamOffsetIndex] = BailOutRecord::GetArgumentsObjectOffset();
diff --git a/lib/Backend/SccLiveness.cpp b/lib/Backend/SccLiveness.cpp
@@ -463,7 +463,7 @@ SCCLiveness::ProcessBailOutUses(IR::Instr * instr)
     }
     NEXT_BITSET_IN_SPARSEBV;
 
-    FOREACH_SLISTBASE_ENTRY(CopyPropSyms, copyPropSyms, &bailOutInfo->usedCapturedValues.copyPropSyms)
+    FOREACH_SLISTBASE_ENTRY(CopyPropSyms, copyPropSyms, &bailOutInfo->usedCapturedValues->copyPropSyms)
     {
         ProcessStackSymUse(copyPropSyms.Value(), instr);
     }

Original file line number	Diff line number	Diff line change
`@@ -1716,19 +1716,19 @@ BackwardPass::ProcessBailOutArgObj(BailOutInfo * bailOutInfo, BVSparse<JitArenaA`
`1716`	`1716`	`{`
`1717`	`1717`	`if (byteCodeUpwardExposedUsed->TestAndClear(symId))`
`1718`	`1718`	`{`
`1719`		`- if (bailOutInfo->usedCapturedValues.argObjSyms == nullptr)`
	`1719`	`+ if (bailOutInfo->usedCapturedValues->argObjSyms == nullptr)`
`1720`	`1720`	`{`
`1721`		`- bailOutInfo->usedCapturedValues.argObjSyms = JitAnew(this->func->m_alloc,`
	`1721`	`+ bailOutInfo->usedCapturedValues->argObjSyms = JitAnew(this->func->m_alloc,`
`1722`	`1722`	`BVSparse<JitArenaAllocator>, this->func->m_alloc);`
`1723`	`1723`	`}`
`1724`		`- bailOutInfo->usedCapturedValues.argObjSyms->Set(symId);`
	`1724`	`+ bailOutInfo->usedCapturedValues->argObjSyms->Set(symId);`
`1725`	`1725`	`}`
`1726`	`1726`	`}`
`1727`	`1727`	`NEXT_BITSET_IN_SPARSEBV;`
`1728`	`1728`	`}`
`1729`		`- if (bailOutInfo->usedCapturedValues.argObjSyms)`
	`1729`	`+ if (bailOutInfo->usedCapturedValues->argObjSyms)`
`1730`	`1730`	`{`
`1731`		`- byteCodeUpwardExposedUsed->Minus(bailOutInfo->usedCapturedValues.argObjSyms);`
	`1731`	`+ byteCodeUpwardExposedUsed->Minus(bailOutInfo->usedCapturedValues->argObjSyms);`
`1732`	`1732`	`}`
`1733`	`1733`	`}`
`1734`	`1734`
`@@ -1738,7 +1738,7 @@ BackwardPass::ProcessBailOutConstants(BailOutInfo * bailOutInfo, BVSparse<JitAre`
`1738`	`1738`	`Assert(this->tag != Js::BackwardPhase);`
`1739`	`1739`
`1740`	`1740`	`// Remove constants that we are already going to restore`
`1741`		`- SListBase<ConstantStackSymValue> * usedConstantValues = &bailOutInfo->usedCapturedValues.constantValues;`
	`1741`	`+ SListBase<ConstantStackSymValue> * usedConstantValues = &bailOutInfo->usedCapturedValues->constantValues;`
`1742`	`1742`	`FOREACH_SLISTBASE_ENTRY(ConstantStackSymValue, value, usedConstantValues)`
`1743`	`1743`	`{`
`1744`	`1744`	`byteCodeUpwardExposedUsed->Clear(value.Key()->m_id);`
`@@ -1770,7 +1770,7 @@ BackwardPass::ProcessBailOutCopyProps(BailOutInfo * bailOutInfo, BVSparse<JitAre`
`1770`	`1770`	`Assert(!this->func->GetJITFunctionBody()->IsAsmJsMode());`
`1771`	`1771`
`1772`	`1772`	`// Remove copy prop that we were already going to restore`
`1773`		`- SListBase<CopyPropSyms> * usedCopyPropSyms = &bailOutInfo->usedCapturedValues.copyPropSyms;`
	`1773`	`+ SListBase<CopyPropSyms> * usedCopyPropSyms = &bailOutInfo->usedCapturedValues->copyPropSyms;`
`1774`	`1774`	`FOREACH_SLISTBASE_ENTRY(CopyPropSyms, copyPropSyms, usedCopyPropSyms)`
`1775`	`1775`	`{`
`1776`	`1776`	`byteCodeUpwardExposedUsed->Clear(copyPropSyms.Key()->m_id);`
`@@ -2602,7 +2602,7 @@ BackwardPass::ProcessBailOutInfo(IR::Instr * instr, BailOutInfo * bailOutInfo)`
`2602`	`2602`	`tempBv->And(this->func->m_nonTempLocalVars, bailOutInfo->liveVarSyms);`
`2603`	`2603`
`2604`	`2604`	`// Remove syms that are restored in other ways than byteCodeUpwardExposedUsed.`
`2605`		`- FOREACH_SLIST_ENTRY(ConstantStackSymValue, value, &bailOutInfo->usedCapturedValues.constantValues)`
	`2605`	`+ FOREACH_SLIST_ENTRY(ConstantStackSymValue, value, &bailOutInfo->usedCapturedValues->constantValues)`
`2606`	`2606`	`{`
`2607`	`2607`	`Assert(value.Key()->HasByteCodeRegSlot() \|\| value.Key()->GetInstrDef()->m_opcode == Js::OpCode::BytecodeArgOutCapture);`
`2608`	`2608`	`if (value.Key()->HasByteCodeRegSlot())`
`@@ -2611,7 +2611,7 @@ BackwardPass::ProcessBailOutInfo(IR::Instr * instr, BailOutInfo * bailOutInfo)`
`2611`	`2611`	`}`
`2612`	`2612`	`}`
`2613`	`2613`	`NEXT_SLIST_ENTRY;`
`2614`		`- FOREACH_SLIST_ENTRY(CopyPropSyms, value, &bailOutInfo->usedCapturedValues.copyPropSyms)`
	`2614`	`+ FOREACH_SLIST_ENTRY(CopyPropSyms, value, &bailOutInfo->usedCapturedValues->copyPropSyms)`
`2615`	`2615`	`{`
`2616`	`2616`	`Assert(value.Key()->HasByteCodeRegSlot() \|\| value.Key()->GetInstrDef()->m_opcode == Js::OpCode::BytecodeArgOutCapture);`
`2617`	`2617`	`if (value.Key()->HasByteCodeRegSlot())`
`@@ -2620,9 +2620,9 @@ BackwardPass::ProcessBailOutInfo(IR::Instr * instr, BailOutInfo * bailOutInfo)`
`2620`	`2620`	`}`
`2621`	`2621`	`}`
`2622`	`2622`	`NEXT_SLIST_ENTRY;`
`2623`		`- if (bailOutInfo->usedCapturedValues.argObjSyms)`
	`2623`	`+ if (bailOutInfo->usedCapturedValues->argObjSyms)`
`2624`	`2624`	`{`
`2625`		`- tempBv->Minus(bailOutInfo->usedCapturedValues.argObjSyms);`
	`2625`	`+ tempBv->Minus(bailOutInfo->usedCapturedValues->argObjSyms);`
`2626`	`2626`	`}`
`2627`	`2627`
`2628`	`2628`	`byteCodeUpwardExposedUsed->Or(tempBv);`
`@@ -8326,7 +8326,7 @@ BackwardPass::ReverseCopyProp(IR::Instr *instr)`
`8326`	`8326`	`FOREACH_SLISTBASE_ENTRY(`
`8327`	`8327`	`CopyPropSyms,`
`8328`	`8328`	`usedCopyPropSym,`
`8329`		`- &instrPrev->GetBailOutInfo()->usedCapturedValues.copyPropSyms)`
	`8329`	`+ &instrPrev->GetBailOutInfo()->usedCapturedValues->copyPropSyms)`
`8330`	`8330`	`{`
`8331`	`8331`	`if(dstSym == usedCopyPropSym.Value())`
`8332`	`8332`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1417,7 +1417,7 @@ LinearScan::FillBailOutRecord(IR::Instr * instr)`
`1417`	`1417`	`memset(state.registerSaveSyms, 0, sizeof(state.registerSaveSyms));`
`1418`	`1418`
`1419`	`1419`	`// Fill in the constants`
`1420`		`- FOREACH_SLISTBASE_ENTRY_EDITING(ConstantStackSymValue, value, &bailOutInfo->usedCapturedValues.constantValues, constantValuesIterator)`
	`1420`	`+ FOREACH_SLISTBASE_ENTRY_EDITING(ConstantStackSymValue, value, &bailOutInfo->usedCapturedValues->constantValues, constantValuesIterator)`
`1421`	`1421`	`{`
`1422`	`1422`	`AssertMsg(bailOutInfo->bailOutRecord->bailOutKind != IR::BailOutForGeneratorYield, "constant prop syms unexpected for bail-in for generator yield");`
`1423`	`1423`	`StackSym * stackSym = value.Key();`
`@@ -1460,7 +1460,7 @@ LinearScan::FillBailOutRecord(IR::Instr * instr)`
`1460`	`1460`	`NEXT_SLISTBASE_ENTRY_EDITING;`
`1461`	`1461`
`1462`	`1462`	`// Fill in the copy prop syms`
`1463`		`- FOREACH_SLISTBASE_ENTRY_EDITING(CopyPropSyms, copyPropSyms, &bailOutInfo->usedCapturedValues.copyPropSyms, copyPropSymsIter)`
	`1463`	`+ FOREACH_SLISTBASE_ENTRY_EDITING(CopyPropSyms, copyPropSyms, &bailOutInfo->usedCapturedValues->copyPropSyms, copyPropSymsIter)`
`1464`	`1464`	`{`
`1465`	`1465`	`AssertMsg(bailOutInfo->bailOutRecord->bailOutKind != IR::BailOutForGeneratorYield, "copy prop syms unexpected for bail-in for generator yield");`
`1466`	`1466`	`StackSym * stackSym = copyPropSyms.Key();`
`@@ -1513,9 +1513,9 @@ LinearScan::FillBailOutRecord(IR::Instr * instr)`
`1513`	`1513`	`}`
`1514`	`1514`	`NEXT_BITSET_IN_SPARSEBV;`
`1515`	`1515`
`1516`		`- if (bailOutInfo->usedCapturedValues.argObjSyms)`
	`1516`	`+ if (bailOutInfo->usedCapturedValues->argObjSyms)`
`1517`	`1517`	`{`
`1518`		`- FOREACH_BITSET_IN_SPARSEBV(id, bailOutInfo->usedCapturedValues.argObjSyms)`
	`1518`	`+ FOREACH_BITSET_IN_SPARSEBV(id, bailOutInfo->usedCapturedValues->argObjSyms)`
`1519`	`1519`	`{`
`1520`	`1520`	`StackSym * stackSym = this->func->m_symTable->FindStackSym(id);`
`1521`	`1521`	`Assert(stackSym != nullptr);`
`@@ -1705,7 +1705,7 @@ LinearScan::FillBailOutRecord(IR::Instr * instr)`
`1705`	`1705`	`uint outParamOffsetIndex = outParamStart + argSlot;`
`1706`	`1706`	`if (!sym->m_isBailOutReferenced && !sym->IsArgSlotSym())`
`1707`	`1707`	`{`
`1708`		`- FOREACH_SLISTBASE_ENTRY_EDITING(ConstantStackSymValue, constantValue, &bailOutInfo->usedCapturedValues.constantValues, iterator)`
	`1708`	`+ FOREACH_SLISTBASE_ENTRY_EDITING(ConstantStackSymValue, constantValue, &bailOutInfo->usedCapturedValues->constantValues, iterator)`
`1709`	`1709`	`{`
`1710`	`1710`	`if (constantValue.Key()->m_id == sym->m_id)`
`1711`	`1711`	`{`
`@@ -1731,13 +1731,13 @@ LinearScan::FillBailOutRecord(IR::Instr * instr)`
`1731`	`1731`	`continue;`
`1732`	`1732`	`}`
`1733`	`1733`
`1734`		`- FOREACH_SLISTBASE_ENTRY_EDITING(CopyPropSyms, copyPropSym, &bailOutInfo->usedCapturedValues.copyPropSyms, iter)`
	`1734`	`+ FOREACH_SLISTBASE_ENTRY_EDITING(CopyPropSyms, copyPropSym, &bailOutInfo->usedCapturedValues->copyPropSyms, iter)`
`1735`	`1735`	`{`
`1736`	`1736`	`if (copyPropSym.Key()->m_id == sym->m_id)`
`1737`	`1737`	`{`
`1738`	`1738`	`StackSym * copyStackSym = copyPropSym.Value();`
`1739`	`1739`
`1740`		`- BVSparse<JitArenaAllocator>* argObjSyms = bailOutInfo->usedCapturedValues.argObjSyms;`
	`1740`	`+ BVSparse<JitArenaAllocator>* argObjSyms = bailOutInfo->usedCapturedValues->argObjSyms;`
`1741`	`1741`	`if (argObjSyms && argObjSyms->Test(copyStackSym->m_id))`
`1742`	`1742`	`{`
`1743`	`1743`	`outParamOffsets[outParamOffsetIndex] = BailOutRecord::GetArgumentsObjectOffset();`
`@@ -1845,7 +1845,7 @@ LinearScan::FillBailOutRecord(IR::Instr * instr)`
`1845`	`1845`	`Assert(LowererMD::IsAssign(instrDef));`
`1846`	`1846`	`}`
`1847`	`1847`
`1848`		`- if (bailOutInfo->usedCapturedValues.argObjSyms && bailOutInfo->usedCapturedValues.argObjSyms->Test(sym->m_id))`
	`1848`	`+ if (bailOutInfo->usedCapturedValues->argObjSyms && bailOutInfo->usedCapturedValues->argObjSyms->Test(sym->m_id))`
`1849`	`1849`	`{`
`1850`	`1850`	`//foo.apply(this,arguments) case and we bailout when the apply is overridden. We need to restore the arguments object.`
`1851`	`1851`	`outParamOffsets[outParamOffsetIndex] = BailOutRecord::GetArgumentsObjectOffset();`
Original file line number	Diff line number	Diff line change
`@@ -463,7 +463,7 @@ SCCLiveness::ProcessBailOutUses(IR::Instr * instr)`
`463`	`463`	`}`
`464`	`464`	`NEXT_BITSET_IN_SPARSEBV;`
`465`	`465`
`466`		`- FOREACH_SLISTBASE_ENTRY(CopyPropSyms, copyPropSyms, &bailOutInfo->usedCapturedValues.copyPropSyms)`
	`466`	`+ FOREACH_SLISTBASE_ENTRY(CopyPropSyms, copyPropSyms, &bailOutInfo->usedCapturedValues->copyPropSyms)`
`467`	`467`	`{`
`468`	`468`	`ProcessStackSymUse(copyPropSyms.Value(), instr);`
`469`	`469`	`}`