commit ee29cc3b661727db96b4197e8d668c430b7ddcaf
author Zhongxing Xu <xuzhongxing@gmail.com> Thu Feb 25 07:57:35 2010 +0000
committer Zhongxing Xu <xuzhongxing@gmail.com> Thu Feb 25 07:57:35 2010 +0000
tree 5267b63b73f1e02deaf88b24db8f469e16d11dfc
parent 62702da070e40724788c6c6ef8bfbca9e53c685a

Move the GenerateCallExitNode logic completely into GREndPathNodeBuilder.

llvm-svn: 97131

clang/lib/Checker/GRCoreEngine.cpp

diff --git a/clang/lib/Checker/GRCoreEngine.cpp b/clang/lib/Checker/GRCoreEngine.cpp
index cbc1cf2..cc8abc8 100644
--- a/clang/lib/Checker/GRCoreEngine.cpp
+++ b/clang/lib/Checker/GRCoreEngine.cpp
@@ -612,7 +612,13 @@
 
 GREndPathNodeBuilder::~GREndPathNodeBuilder() {
   // Auto-generate an EOP node if one has not been generated.
-  if (!HasGeneratedNode) generateNode(Pred->State);
+  if (!HasGeneratedNode) {
+    // If we are in an inlined call, generate CallExit node.
+    if (Pred->getLocationContext()->getParent())
+      GenerateCallExitNode(Pred->State);
+    else
+      generateNode(Pred->State);
+  }
 }
 
 ExplodedNode*