Index: include/clang/Basic/DiagnosticSemaKinds.td
===================================================================
--- include/clang/Basic/DiagnosticSemaKinds.td	(revision 139364)
+++ include/clang/Basic/DiagnosticSemaKinds.td	(working copy)
@@ -236,7 +236,7 @@
 def err_falloff_nonvoid_block : Error<
   "control reaches end of non-void block">;
 def warn_suggest_noreturn_function : Warning<
-  "function %0 could be declared with attribute 'noreturn'">,
+  "%select{function|method}0 %1 could be declared with attribute 'noreturn'">,
   InGroup<DiagGroup<"missing-noreturn">>, DefaultIgnore;
 def warn_suggest_noreturn_block : Warning<
   "block could be declared with attribute 'noreturn'">,
Index: lib/Sema/AnalysisBasedWarnings.cpp
===================================================================
--- lib/Sema/AnalysisBasedWarnings.cpp	(revision 139364)
+++ lib/Sema/AnalysisBasedWarnings.cpp	(working copy)
@@ -379,8 +379,13 @@
         if (ReturnsVoid && !HasNoReturn && CD.diag_NeverFallThroughOrReturn) {
           if (const FunctionDecl *FD = dyn_cast<FunctionDecl>(D)) {
             S.Diag(Compound->getLBracLoc(), CD.diag_NeverFallThroughOrReturn)
-              << FD;
-          } else {
+              << 0 << FD;
+          } 
+          else if (const ObjCMethodDecl *MD = dyn_cast<ObjCMethodDecl>(D)) {
+            S.Diag(Compound->getLBracLoc(), CD.diag_NeverFallThroughOrReturn)
+              << 1 << MD;
+          } 
+          else {
             S.Diag(Compound->getLBracLoc(), CD.diag_NeverFallThroughOrReturn);
           }
         }
Index: test/SemaObjC/return.m
===================================================================
--- test/SemaObjC/return.m	(revision 139364)
+++ test/SemaObjC/return.m	(working copy)
@@ -39,3 +39,12 @@
     }
 }
 
+@interface Foo
+- (void)test4;
+@end
+@implementation Foo
+- (void)test4 { // expected-warning {{method 'test4' could be declared with attribute 'noreturn'}}
+  @throw @"c";
+}
+@end
+