diff --git a/lib/CodeGen/CodeGenFunction.cpp b/lib/CodeGen/CodeGenFunction.cpp
index b182ecf..12e468c 100644
--- a/lib/CodeGen/CodeGenFunction.cpp
+++ b/lib/CodeGen/CodeGenFunction.cpp
@@ -73,9 +73,7 @@
 
   // Emit debug descriptor for function end.
   if (CGDebugInfo *DI = CGM.getDebugInfo()) {
-    if (EndLoc.isValid()) {
-      DI->setLocation(EndLoc);
-    }
+    DI->setLocation(EndLoc);
     DI->EmitRegionEnd(CurFn, Builder);
   }
  
@@ -126,10 +124,8 @@
   // FIXME: The cast here is a huge hack.
   if (const FunctionDecl *FD = dyn_cast<FunctionDecl>(D)) {
     if (CGDebugInfo *DI = CGM.getDebugInfo()) {
-      CompoundStmt* body = dyn_cast<CompoundStmt>(FD->getBody());
-      if (body && body->getLBracLoc().isValid()) {
+      if (CompoundStmt* body = dyn_cast<CompoundStmt>(FD->getBody()))
         DI->setLocation(body->getLBracLoc());
-      }
       DI->EmitFunctionStart(FD, CurFn, Builder);
     }
   }