commit 13fb860c7847d371a6b18dc38e805366bc582e24
author Richard Smith <richard-llvm@metafoo.co.uk> Fri Jul 15 21:33:46 2016 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Fri Jul 15 21:33:46 2016 +0000
tree b3aa960dc285985f11222a29a64a3b8a50e98150
parent c7536a5d60aa1568b0014dc9da3214d62b26e808

Revert r275481, r275490. This broke modules bootstrap.

llvm-svn: 275624

clang/lib/Serialization/ASTWriterDecl.cpp

diff --git a/clang/lib/Serialization/ASTWriterDecl.cpp b/clang/lib/Serialization/ASTWriterDecl.cpp
index 8a54d9e..23d1854 100644
--- a/clang/lib/Serialization/ASTWriterDecl.cpp
+++ b/clang/lib/Serialization/ASTWriterDecl.cpp
@@ -2126,7 +2126,7 @@
   // ImportDecl is used by codegen to determine the set of imported modules to
   // search for inputs for automatic linking; include it if it has a semantic
   // effect.
-  if (isa<ImportDecl>(D))
+  if (isa<ImportDecl>(D) && !WritingModule)
     return true;
 
   return Context.DeclMustBeEmitted(D);