Merge pull request #68657 from nate-chandler/nfc/20230920/1/add-null-check

swift-ci · web-flow · commit 71cb84b24ab9 · 2023-09-20T17:18:49.000-07:00
[SILVerifier] Add null check for dead end blocks.
diff --git a/lib/SIL/Verifier/SILVerifier.cpp b/lib/SIL/Verifier/SILVerifier.cpp
@@ -2406,7 +2406,7 @@ class SILVerifier : public SILVerifierBase<SILVerifier> {
     // Check if the collected uses are well-scoped.
     for (auto *use : uses) {
       auto *user = use->getUser();
-      if (deadEndBlocks->isDeadEnd(user->getParent())) {
+      if (deadEndBlocks && deadEndBlocks->isDeadEnd(user->getParent())) {
         continue;
       }
       if (scopedAddress.isScopeEndingUse(use)) {

Original file line number	Diff line number	Diff line change
`@@ -2406,7 +2406,7 @@ class SILVerifier : public SILVerifierBase<SILVerifier> {`
`2406`	`2406`	`// Check if the collected uses are well-scoped.`
`2407`	`2407`	`for (auto *use : uses) {`
`2408`	`2408`	`auto *user = use->getUser();`
`2409`		`- if (deadEndBlocks->isDeadEnd(user->getParent())) {`
	`2409`	`+ if (deadEndBlocks && deadEndBlocks->isDeadEnd(user->getParent())) {`
`2410`	`2410`	`continue;`
`2411`	`2411`	`}`
`2412`	`2412`	`if (scopedAddress.isScopeEndingUse(use)) {`