Merge pull request swiftlang#23573 from nkcsgexi/null-ptr-isprivate

nkcsgexi · web-flow · commit 33208233c80e · 2019-03-26T14:36:28.000-07:00
AST: fix a null pointer error found by performing module API checking
diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
@@ -530,8 +530,10 @@ bool Decl::isPrivateStdlibDecl(bool treatNonBuiltinProtocolsAsPublic) const {
   }
 
   if (auto ImportD = dyn_cast<ImportDecl>(D)) {
-    if (ImportD->getModule()->isSwiftShimsModule())
-      return true;
+    if (auto *Mod = ImportD->getModule()) {
+      if (Mod->isSwiftShimsModule())
+        return true;
+    }
   }
 
   auto VD = dyn_cast<ValueDecl>(D);

Original file line number	Diff line number	Diff line change
`@@ -530,8 +530,10 @@ bool Decl::isPrivateStdlibDecl(bool treatNonBuiltinProtocolsAsPublic) const {`
`530`	`530`	`}`
`531`	`531`
`532`	`532`	`if (auto ImportD = dyn_cast<ImportDecl>(D)) {`
`533`		`- if (ImportD->getModule()->isSwiftShimsModule())`
`534`		`- return true;`
	`533`	`+ if (auto *Mod = ImportD->getModule()) {`
	`534`	`+ if (Mod->isSwiftShimsModule())`
	`535`	`+ return true;`
	`536`	`+ }`
`535`	`537`	`}`
`536`	`538`
`537`	`539`	`auto VD = dyn_cast<ValueDecl>(D);`