1 files changed, 8 insertions, 4 deletions
diff --git a/Driver/RewriteTest.cpp b/Driver/RewriteTest.cpp
index 78cd90e9a9..283f360234 100644
--- a/Driver/RewriteTest.cpp
+++ b/Driver/RewriteTest.cpp
@@ -336,11 +336,15 @@ void RewriteTest::RewriteForwardClassDecl(ObjcClassDecl *ClassDecl) {
 void RewriteTest::RewriteMethodDeclarations(int nMethods, ObjcMethodDecl **Methods) {
   for (int i = 0; i < nMethods; i++) {
     ObjcMethodDecl *Method = Methods[i];
-    SourceLocation Loc = Method->getLocStart();
-
-    Rewrite.InsertText(Loc, "// ", 3);
+    SourceLocation LocStart = Method->getLocStart();
+    SourceLocation LocEnd = Method->getLocEnd();
     
-    // FIXME: handle methods that are declared across multiple lines.
+    if (SM->getLineNumber(LocEnd) > SM->getLineNumber(LocStart)) {
+      Rewrite.InsertText(LocStart, "/* ", 3);
+      Rewrite.ReplaceText(LocEnd, 1, ";*/ ", 4);
+    } else {
+      Rewrite.InsertText(LocStart, "// ", 3);
+    }
   }
 }