commit e49a42cae99b43ed1a4004ac0ed298608384f0d8
author Fariborz Jahanian <fjahanian@apple.com> Wed Apr 25 17:56:48 2012 +0000
committer Fariborz Jahanian <fjahanian@apple.com> Wed Apr 25 17:56:48 2012 +0000
tree 76a6bb1f1bc198029983a6bc7088dff454251534
parent 7d2222175914bee03d2aa191427d6c397cc2d617

modern objc rewriter: fixes a bug writing 
a const qualified static c-function. 
// rdar://11314329

llvm-svn: 155564

clang/lib/Rewrite/RewriteModernObjC.cpp

diff --git a/clang/lib/Rewrite/RewriteModernObjC.cpp b/clang/lib/Rewrite/RewriteModernObjC.cpp
index 9cefa5e..705a046 100644
--- a/clang/lib/Rewrite/RewriteModernObjC.cpp
+++ b/clang/lib/Rewrite/RewriteModernObjC.cpp
@@ -4133,7 +4133,9 @@
 }
 
 void RewriteModernObjC::InsertBlockLiteralsWithinFunction(FunctionDecl *FD) {
-  SourceLocation FunLocStart = getFunctionSourceLocation(*this, FD);
+  SourceLocation FunLocStart = 
+    (!Blocks.empty()) ? getFunctionSourceLocation(*this, FD)
+                      : FD->getTypeSpecStartLoc();
   StringRef FuncName = FD->getName();
 
   SynthesizeBlockLiterals(FunLocStart, FuncName);