Merge pull request #19077 from atrick/fix-ndebug-verify

atrick · web-flow · commit 12fa67490e56 · 2018-08-31T00:13:01.000-07:00
Guard verifyCriticalEdges with #ifndef NDEBUG.
diff --git a/lib/SIL/SILVerifier.cpp b/lib/SIL/SILVerifier.cpp
@@ -4861,6 +4861,10 @@ void SILFunction::verify(bool SingleFunction) const {
 }
 
 void SILFunction::verifyCriticalEdges() const {
+#ifdef NDEBUG
+  if (!getModule().getOptions().VerifyAll)
+    return;
+#endif
   SILVerifier(*this, /*SingleFunction=*/true).verifyBranches(this);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -4861,6 +4861,10 @@ void SILFunction::verify(bool SingleFunction) const {`
`4861`	`4861`	`}`
`4862`	`4862`
`4863`	`4863`	`void SILFunction::verifyCriticalEdges() const {`
	`4864`	`+#ifdef NDEBUG`
	`4865`	`+ if (!getModule().getOptions().VerifyAll)`
	`4866`	`+ return;`
	`4867`	`+#endif`
`4864`	`4868`	`SILVerifier(this, /SingleFunction=*/true).verifyBranches(this);`
`4865`	`4869`	`}`
`4866`	`4870`