On Steve's suggestion, moved handling of use of undeclared method in a message

to rewriter (my previous patch).


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

2 files changed, 4 insertions, 8 deletions

diff --git a/Driver/RewriteTest.cpp b/Driver/RewriteTest.cpp
index b0c40f7b34..9b19cfb450 100644
--- a/Driver/RewriteTest.cpp
+++ b/Driver/RewriteTest.cpp
@@ -1419,8 +1419,8 @@ Stmt *RewriteTest::RewriteMessageExpr(ObjCMessageExpr *Exp) {
     
   // Now do the "normal" pointer to function cast.
   QualType castType = Context->getFunctionType(returnType, 
-                                               &ArgTypes[0], ArgTypes.size(),
-                                               Exp->getMethodDecl()->isVariadic());
+    &ArgTypes[0], ArgTypes.size(),
+    Exp->getMethodDecl() ? Exp->getMethodDecl()->isVariadic() : false);
   castType = Context->getPointerType(castType);
   cast = new CastExpr(castType, cast, SourceLocation());
 
@@ -1444,8 +1444,8 @@ Stmt *RewriteTest::RewriteMessageExpr(ObjCMessageExpr *Exp) {
                         SourceLocation());
     // Now do the "normal" pointer to function cast.
     castType = Context->getFunctionType(returnType, 
-                                        &ArgTypes[0], ArgTypes.size(),
-                                        Exp->getMethodDecl()->isVariadic());
+      &ArgTypes[0], ArgTypes.size(),
+      Exp->getMethodDecl() ? Exp->getMethodDecl()->isVariadic() : false);
     castType = Context->getPointerType(castType);
     cast = new CastExpr(castType, cast, SourceLocation());
     
diff --git a/Sema/SemaExpr.cpp b/Sema/SemaExpr.cpp
index 95b900c677..ed71934621 100644
--- a/Sema/SemaExpr.cpp
+++ b/Sema/SemaExpr.cpp
@@ -2242,10 +2242,6 @@ Sema::ExprResult Sema::ActOnInstanceMessage(
       Diag(lbrac, diag::warn_method_not_found, std::string("-"), Sel.getName(),
            SourceRange(lbrac, rbrac));
       returnType = Context.getObjcIdType();
-      // Must have a dummy method declaration, so clients work as expected
-      Method = new ObjcMethodDecl(SourceLocation(), SourceLocation(), Sel, 
-                                  returnType, ClassDecl, 0, -1, 0, true, false, 
-                                  ObjcMethodDecl::None);
     } else {
       returnType = Method->getResultType();
       if (Sel.getNumArgs())