Changing an assert in globopt to correctly reflect the invariant

rajatd · rajatd · commit c119221293fe · 2018-05-22T16:08:22.000-07:00
diff --git a/lib/Backend/GlobOptBailOut.cpp b/lib/Backend/GlobOptBailOut.cpp
@@ -784,8 +784,6 @@ void GlobOpt::RecordInlineeFrameInfo(IR::Instr* inlineeEnd)
                     }
                 }
 
-                GlobOptBlockData& globOptData = this->currentBlock->globOptData;
-
                 if (frameInfo->intSyms->TestEmpty() && frameInfo->intSyms->Test(argSym->m_id))
                 {
                     // Var version of the sym is not live, use the int32 version
@@ -800,7 +798,7 @@ void GlobOpt::RecordInlineeFrameInfo(IR::Instr* inlineeEnd)
                 }
                 else
                 {
-                    Assert(globOptData.liveVarSyms->Test(argSym->m_id));
+                    Assert(frameInfo->varSyms->Test(argSym->m_id));
                 }
 
                 if (argSym->IsConst() && !argSym->IsInt64Const())

Original file line number	Diff line number	Diff line change
`@@ -784,8 +784,6 @@ void GlobOpt::RecordInlineeFrameInfo(IR::Instr* inlineeEnd)`
`784`	`784`	`}`
`785`	`785`	`}`
`786`	`786`
`787`		`- GlobOptBlockData& globOptData = this->currentBlock->globOptData;`
`788`		`-`
`789`	`787`	`if (frameInfo->intSyms->TestEmpty() && frameInfo->intSyms->Test(argSym->m_id))`
`790`	`788`	`{`
`791`	`789`	`// Var version of the sym is not live, use the int32 version`
`@@ -800,7 +798,7 @@ void GlobOpt::RecordInlineeFrameInfo(IR::Instr* inlineeEnd)`
`800`	`798`	`}`
`801`	`799`	`else`
`802`	`800`	`{`
`803`		`- Assert(globOptData.liveVarSyms->Test(argSym->m_id));`
	`801`	`+ Assert(frameInfo->varSyms->Test(argSym->m_id));`
`804`	`802`	`}`
`805`	`803`
`806`	`804`	`if (argSym->IsConst() && !argSym->IsInt64Const())`