Small bug fix when handling CallExprs that generate sink nodes.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@47970 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/Analysis/GRExprEngine.cpp b/Analysis/GRExprEngine.cpp
index f8ebbec..fa623a4 100644
--- a/Analysis/GRExprEngine.cpp
+++ b/Analysis/GRExprEngine.cpp
@@ -501,17 +501,8 @@
     SaveAndRestore<bool> OldSink(Builder->BuildSinks);
     
     if (isa<lval::FuncVal>(L))
-      if (cast<lval::FuncVal>(L).getDecl()->getAttr<NoReturnAttr>()) {
-        for (NodeSet::iterator I=Dst.begin(), E=Dst.end(); I != E; ++I ) {
-          
-          NodeTy* N = *I;
-          
-          if (!N->isSink())
-            N->markAsSink();
-        }
-        
+      if (cast<lval::FuncVal>(L).getDecl()->getAttr<NoReturnAttr>())
         Builder->BuildSinks = true;
-      }
     
     // Evaluate the call.
     
@@ -573,7 +564,7 @@
       
       EvalCall(Dst, CE, cast<LVal>(L), *DI);
       
-      if (Dst.size() == size)
+      if (!Builder->BuildSinks && Dst.size() == size)
         Nodify(Dst, CE, *DI, St);
     }
   }