diff --git a/clang/lib/CodeGen/CodeGenFunction.cpp b/clang/lib/CodeGen/CodeGenFunction.cpp
index 7ddc2213705f..4bdebfe43157 100644
--- a/clang/lib/CodeGen/CodeGenFunction.cpp
+++ b/clang/lib/CodeGen/CodeGenFunction.cpp
@@ -225,16 +225,11 @@ void CodeGenFunction::GenerateCode(const FunctionDecl *FD,
                                     FProto->getArgType(i)));
   }
 
-  StartFunction(FD, FD->getResultType(), Fn, Args,
-                cast<CompoundStmt>(FD->getBody())->getLBracLoc());
+  const CompoundStmt *S = FD->getBody();
 
-  EmitStmt(FD->getBody());
-  
-  const CompoundStmt *S = dyn_cast<CompoundStmt>(FD->getBody());
-  if (S)
-    FinishFunction(S->getRBracLoc());
-  else
-    FinishFunction();
+  StartFunction(FD, FD->getResultType(), Fn, Args, S->getLBracLoc());
+  EmitStmt(S);
+  FinishFunction(S->getRBracLoc());
     
   // Destroy the 'this' declaration.
   if (CXXThisDecl)