Tell ASTMerge to merge every declaration it sees, rather than cherry-picking those declarations that we know will work.

llvm-svn: 96280

1 files changed, 1 insertions, 15 deletions

diff --git a/clang/lib/Frontend/ASTMerge.cpp b/clang/lib/Frontend/ASTMerge.cpp
index fbb87669d9a..821863e0762 100644
--- a/clang/lib/Frontend/ASTMerge.cpp
+++ b/clang/lib/Frontend/ASTMerge.cpp
@@ -52,21 +52,7 @@ void ASTMergeAction::ExecuteAction() {
     for (DeclContext::decl_iterator D = TU->decls_begin(), 
                                  DEnd = TU->decls_end();
          D != DEnd; ++D) {
-      // FIXME: We only merge variables whose names start with x and functions
-      // whose names start with 'f'. Why would anyone want anything else?
-      if (VarDecl *VD = dyn_cast<VarDecl>(*D)) {
-        if (VD->getIdentifier() && 
-            *VD->getIdentifier()->getNameStart() == 'x') {
-          Decl *Merged = Importer.Import(VD);
-          (void)Merged;
-        }
-      } else if (FunctionDecl *FD = dyn_cast<FunctionDecl>(*D)) {
-        if (FD->getIdentifier() &&
-            *FD->getIdentifier()->getNameStart() == 'f') {
-          Decl *Merged = Importer.Import(FD);
-          (void)Merged;
-        }
-      }
+      Importer.Import(*D);
     }
 
     delete Unit;