Merge pull request #207 from mrecachinas/irgensil-assertion

jckarter · jckarter · commit 5e4bb4b96c68 · 2015-12-04T14:08:27.000-08:00
[IRGen] Add assertion to `emitPHINodesForBBArgs`
diff --git a/lib/IRGen/IRGenSIL.cpp b/lib/IRGen/IRGenSIL.cpp
@@ -828,9 +828,7 @@ emitPHINodesForBBArgs(IRGenSILFunction &IGF,
     if (!silBB->empty()) {
       SILInstruction &I = *silBB->begin();
       auto DS = I.getDebugScope();
-      // FIXME: This should be an assertion.
-      if (!DS || (DS->SILFn != IGF.CurSILFn && !DS->InlinedCallSite))
-        DS = IGF.CurSILFn->getDebugScope();
+      assert(DS && (DS->SILFn == IGF.CurSILFn || DS->InlinedCallSite));
       IGF.IGM.DebugInfo->setCurrentLoc(IGF.Builder, DS, I.getLoc());
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -828,9 +828,7 @@ emitPHINodesForBBArgs(IRGenSILFunction &IGF,`
`828`	`828`	`if (!silBB->empty()) {`
`829`	`829`	`SILInstruction &I = *silBB->begin();`
`830`	`830`	`auto DS = I.getDebugScope();`
`831`		`- // FIXME: This should be an assertion.`
`832`		`- if (!DS \|\| (DS->SILFn != IGF.CurSILFn && !DS->InlinedCallSite))`
`833`		`- DS = IGF.CurSILFn->getDebugScope();`
	`831`	`+ assert(DS && (DS->SILFn == IGF.CurSILFn \|\| DS->InlinedCallSite));`
`834`	`832`	`IGF.IGM.DebugInfo->setCurrentLoc(IGF.Builder, DS, I.getLoc());`
`835`	`833`	`}`
`836`	`834`	`}`