Minor clean up of my last patch.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@152950 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Rewrite/RewriteModernObjC.cpp b/lib/Rewrite/RewriteModernObjC.cpp
index ab5a476..d59fb43 100644
--- a/lib/Rewrite/RewriteModernObjC.cpp
+++ b/lib/Rewrite/RewriteModernObjC.cpp
@@ -1716,16 +1716,14 @@
buf += "try ";
ReplaceText(rparenLoc, 1, buf);
- SourceLocation startLBraceLoc = S->getSynchBody()->getLocEnd();
- const char *startLBraceBuf = SM->getCharacterData(startLBraceLoc);
-
- assert((*startLBraceBuf == '}') && "bogus @synchronized block");
-
- SourceLocation lastCurlyLoc = startLBraceLoc;
+ SourceLocation startRBraceLoc = S->getSynchBody()->getLocEnd();
+ const char *startRBraceBuf = SM->getCharacterData(startRBraceLoc);
+ assert((*startRBraceBuf == '}') && "bogus @synchronized block");
buf = "} catch (id e) {_rethrow = e;}\n";
Write_RethrowObject(buf);
+ // produce objc_sync_exit(expr);
std::string syncBuf;
syncBuf += "\n\tobjc_sync_exit(";
@@ -1748,7 +1746,7 @@
buf += "}\n";
buf += "}\n";
- ReplaceText(lastCurlyLoc, 1, buf);
+ ReplaceText(startRBraceLoc, 1, buf);
return 0;
}