commit cad2c59b0c087edea83d0fbf6eabde4a7960c778
author Douglas Gregor <dgregor@apple.com> Wed Dec 08 16:41:55 2010 +0000
committer Douglas Gregor <dgregor@apple.com> Wed Dec 08 16:41:55 2010 +0000
tree 9ae7731f2084bd427a7243eb564628bc0ca2757b
parent 0a03a3f98b14006a54bcac9e8908a7c9f50e519f

Fix two thinkos and add a test for importing the AST of a category
implementation.


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

lib/AST/ASTImporter.cpp

diff --git a/lib/AST/ASTImporter.cpp b/lib/AST/ASTImporter.cpp
index 7a6afbd..4094c88 100644
--- a/lib/AST/ASTImporter.cpp
+++ b/lib/AST/ASTImporter.cpp
@@ -2834,7 +2834,8 @@
   // If we have an implementation, import it as well.
   if (D->getImplementation()) {
     ObjCCategoryImplDecl *Impl
-      = cast<ObjCCategoryImplDecl>(Importer.Import(D->getImplementation()));
+      = cast_or_null<ObjCCategoryImplDecl>(
+                                       Importer.Import(D->getImplementation()));
     if (!Impl)
       return 0;
     
@@ -3057,7 +3058,7 @@
   }
   
   Importer.Imported(D, ToImpl);
-  ImportDeclContext(ToImpl);
+  ImportDeclContext(D);
   return ToImpl;
 }