diff --git a/include/clang/Analysis/CallGraph.h b/include/clang/Analysis/CallGraph.h
index bf164c0e72..8de0e9f976 100644
--- a/include/clang/Analysis/CallGraph.h
+++ b/include/clang/Analysis/CallGraph.h
@@ -43,6 +43,8 @@ public:
     CalledFunctions.push_back(std::make_pair(L, Node));
   }
 
+  bool hasCallee() const { return begin() != end(); }
+
   const char *getName(ASTContext &Ctx) { return F->getName(Ctx); }
 };
 
diff --git a/lib/Analysis/CallGraph.cpp b/lib/Analysis/CallGraph.cpp
index a296f60553..422c5013cc 100644
--- a/lib/Analysis/CallGraph.cpp
+++ b/lib/Analysis/CallGraph.cpp
@@ -37,6 +37,10 @@ public:
     VisitChildren(S);
   }
 
+  void VisitIfStmt(IfStmt *S) {
+    VisitChildren(S);
+  }
+
   void VisitCallExpr(CallExpr *CE);
 
   void VisitChildren(Stmt *S) {
@@ -106,13 +110,15 @@ CallGraphNode *CallGraph::getOrInsertFunction(Entity *F) {
 
 void CallGraph::print(llvm::raw_ostream &os) {
   for (iterator I = begin(), E = end(); I != E; ++I) {
-    ASTContext &Ctx = *CallerCtx[I->second];
-    os << "function: " << I->first->getName(Ctx) << " calls:\n";
-    for (CallGraphNode::iterator CI = I->second->begin(), CE = I->second->end();
-         CI != CE; ++CI) {
-      os << "    " << CI->second->getName(Ctx);
+    if (I->second->hasCallee()) {
+      ASTContext &Ctx = *CallerCtx[I->second];
+      os << "function: " << I->first->getName(Ctx) << " calls:\n";
+      for (CallGraphNode::iterator CI = I->second->begin(), 
+             CE = I->second->end(); CI != CE; ++CI) {
+        os << "    " << CI->second->getName(Ctx);
+      }
+      os << '\n';
     }
-    os << '\n';
   }
 }