Revert "[ASTImporter] Changed use of Import to Import_New in ASTImporter."

This broke the lldb bots.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@347794 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 9 insertions, 4 deletions

diff --git a/include/clang/AST/ASTImporter.h b/include/clang/AST/ASTImporter.h
index 5b9124c8bc..b292261bf8 100644
--- a/include/clang/AST/ASTImporter.h
+++ b/include/clang/AST/ASTImporter.h
@@ -154,10 +154,15 @@ class Attr;
     /// \return Error information (success or error).
     template <typename ImportT>
     LLVM_NODISCARD llvm::Error importInto(ImportT &To, const ImportT &From) {
-      auto ToOrErr = Import_New(From);
-      if (ToOrErr)
-        To = *ToOrErr;
-      return ToOrErr.takeError();
+      To = Import(From);
+      if (From && !To)
+          return llvm::make_error<ImportError>();
+      return llvm::Error::success();
+      // FIXME: this should be the final code
+      //auto ToOrErr = Import(From);
+      //if (ToOrErr)
+      //  To = *ToOrErr;
+      //return ToOrErr.takeError();
     }
 
     /// Import the given type from the "from" context into the "to"