]> granicus.if.org Git - clang/commitdiff
Minor clean up of my last patch.
authorFariborz Jahanian <fjahanian@apple.com>
Fri, 16 Mar 2012 21:43:45 +0000 (21:43 +0000)
committerFariborz Jahanian <fjahanian@apple.com>
Fri, 16 Mar 2012 21:43:45 +0000 (21:43 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@152950 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Rewrite/RewriteModernObjC.cpp

index ab5a476510093789acbd25a525d990a5fcd01c85..d59fb43008d7ad8d51391eb697d3a5d4dc31c925 100644 (file)
@@ -1716,16 +1716,14 @@ Stmt *RewriteModernObjC::RewriteObjCSynchronizedStmt(ObjCAtSynchronizedStmt *S)
   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 @@ Stmt *RewriteModernObjC::RewriteObjCSynchronizedStmt(ObjCAtSynchronizedStmt *S)
   buf += "}\n";
   buf += "}\n";
 
-  ReplaceText(lastCurlyLoc, 1, buf);
+  ReplaceText(startRBraceLoc, 1, buf);
 
   return 0;
 }