Merge pull request #23574 from nkcsgexi/null-fix-std-priviate-5.1

nkcsgexi · web-flow · commit 154e24efc735 · 2019-03-26T17:15:07.000-07:00
[5.1] AST: fix a null pointer error found by performing module API checking
diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
@@ -520,8 +520,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
`@@ -520,8 +520,10 @@ bool Decl::isPrivateStdlibDecl(bool treatNonBuiltinProtocolsAsPublic) const {`
`520`	`520`	`}`
`521`	`521`
`522`	`522`	`if (auto ImportD = dyn_cast<ImportDecl>(D)) {`
`523`		`- if (ImportD->getModule()->isSwiftShimsModule())`
`524`		`- return true;`
	`523`	`+ if (auto *Mod = ImportD->getModule()) {`
	`524`	`+ if (Mod->isSwiftShimsModule())`
	`525`	`+ return true;`
	`526`	`+ }`
`525`	`527`	`}`
`526`	`528`
`527`	`529`	`auto VD = dyn_cast<ValueDecl>(D);`