<div dir="ltr">Yay! Resource safety ftw.<div><br></div><div>-- Sean Silva</div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Oct 25, 2013 at 11:33 AM, Chris Wailes <span dir="ltr"><<a href="mailto:chris.wailes@gmail.com" target="_blank">chris.wailes@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: chris.wailes<br>
Date: Fri Oct 25 10:33:28 2013<br>
New Revision: 193414<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=193414&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=193414&view=rev</a><br>
Log:<br>
Used OwningPtr to clean up some memory management in Consumed.cpp.<br>
<br>
Modified:<br>
    cfe/trunk/lib/Analysis/Consumed.cpp<br>
<br>
Modified: cfe/trunk/lib/Analysis/Consumed.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Analysis/Consumed.cpp?rev=193414&r1=193413&r2=193414&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Analysis/Consumed.cpp?rev=193414&r1=193413&r2=193414&view=diff</a><br>

==============================================================================<br>
--- cfe/trunk/lib/Analysis/Consumed.cpp (original)<br>
+++ cfe/trunk/lib/Analysis/Consumed.cpp Fri Oct 25 10:33:28 2013<br>
@@ -27,6 +27,7 @@<br>
 #include "clang/Basic/OperatorKinds.h"<br>
 #include "clang/Basic/SourceLocation.h"<br>
 #include "llvm/ADT/DenseMap.h"<br>
+#include "llvm/ADT/OwningPtr.h"<br>
 #include "llvm/ADT/SmallVector.h"<br>
 #include "llvm/Support/Compiler.h"<br>
 #include "llvm/Support/raw_ostream.h"<br>
@@ -1259,7 +1260,7 @@ void ConsumedAnalyzer::determineExpected<br>
 bool ConsumedAnalyzer::splitState(const CFGBlock *CurrBlock,<br>
                                   const ConsumedStmtVisitor &Visitor) {<br>
<br>
-  ConsumedStateMap *FalseStates = new ConsumedStateMap(*CurrStates);<br>
+  OwningPtr<ConsumedStateMap> FalseStates(new ConsumedStateMap(*CurrStates));<br>
   PropagationInfo PInfo;<br>
<br>
   if (const IfStmt *IfNode =<br>
@@ -1274,15 +1275,15 @@ bool ConsumedAnalyzer::splitState(const<br>
     if (PInfo.isTest()) {<br>
       CurrStates->setSource(Cond);<br>
       FalseStates->setSource(Cond);<br>
-      splitVarStateForIf(IfNode, PInfo.getTest(), CurrStates, FalseStates);<br>
+      splitVarStateForIf(IfNode, PInfo.getTest(), CurrStates,<br>
+                         FalseStates.get());<br>
<br>
     } else if (PInfo.isBinTest()) {<br>
       CurrStates->setSource(PInfo.testSourceNode());<br>
       FalseStates->setSource(PInfo.testSourceNode());<br>
-      splitVarStateForIfBinOp(PInfo, CurrStates, FalseStates);<br>
+      splitVarStateForIfBinOp(PInfo, CurrStates, FalseStates.get());<br>
<br>
     } else {<br>
-      delete FalseStates;<br>
       return false;<br>
     }<br>
<br>
@@ -1294,13 +1295,10 @@ bool ConsumedAnalyzer::splitState(const<br>
       if ((BinOp = dyn_cast_or_null<BinaryOperator>(BinOp->getLHS()))) {<br>
         PInfo = Visitor.getInfo(BinOp->getRHS());<br>
<br>
-        if (!PInfo.isTest()) {<br>
-          delete FalseStates;<br>
+        if (!PInfo.isTest())<br>
           return false;<br>
-        }<br>
<br>
       } else {<br>
-        delete FalseStates;<br>
         return false;<br>
       }<br>
     }<br>
@@ -1326,7 +1324,6 @@ bool ConsumedAnalyzer::splitState(const<br>
     }<br>
<br>
   } else {<br>
-    delete FalseStates;<br>
     return false;<br>
   }<br>
<br>
@@ -1338,9 +1335,7 @@ bool ConsumedAnalyzer::splitState(const<br>
     delete CurrStates;<br>
<br>
   if (*++SI)<br>
-    BlockInfo.addInfo(*SI, FalseStates);<br>
-  else<br>
-    delete FalseStates;<br>
+    BlockInfo.addInfo(*SI, FalseStates.take());<br>
<br>
   CurrStates = NULL;<br>
   return true;<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>