Woo. r170000!<div><br></div><div>-eric</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Wed, Dec 12, 2012 at 11:13 AM, Jordan Rose <span dir="ltr"><<a href="mailto:jordan_rose@apple.com" target="_blank">jordan_rose@apple.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: jrose<br>
Date: Wed Dec 12 13:13:44 2012<br>
New Revision: 170000<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=170000&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=170000&view=rev</a><br>
Log:<br>
[analyzer] Don't crash running destructors for multidimensional arrays.<br>
<br>
We don't handle array destructors correctly yet, but we now apply the same<br>
hack (explicitly destroy the first element, implicitly invalidate the rest)<br>
for multidimensional arrays that we already use for linear arrays.<br>
<br>
<rdar://problem/12858542><br>
<br>
Modified:<br>
    cfe/trunk/lib/StaticAnalyzer/Core/ExprEngineCXX.cpp<br>
    cfe/trunk/test/Analysis/dtor.cpp<br>
<br>
Modified: cfe/trunk/lib/StaticAnalyzer/Core/ExprEngineCXX.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Core/ExprEngineCXX.cpp?rev=170000&r1=169999&r2=170000&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Core/ExprEngineCXX.cpp?rev=170000&r1=169999&r2=170000&view=diff</a><br>

==============================================================================<br>
--- cfe/trunk/lib/StaticAnalyzer/Core/ExprEngineCXX.cpp (original)<br>
+++ cfe/trunk/lib/StaticAnalyzer/Core/ExprEngineCXX.cpp Wed Dec 12 13:13:44 2012<br>
@@ -172,7 +172,8 @@<br>
   // FIXME: We need to run the same destructor on every element of the array.<br>
   // This workaround will just run the first destructor (which will still<br>
   // invalidate the entire array).<br>
-  if (const ArrayType *AT = getContext().getAsArrayType(ObjectType)) {<br>
+  // This is a loop because of multidimensional arrays.<br>
+  while (const ArrayType *AT = getContext().getAsArrayType(ObjectType)) {<br>
     ObjectType = AT->getElementType();<br>
     Dest = State->getLValue(ObjectType, getSValBuilder().makeZeroArrayIndex(),<br>
                             loc::MemRegionVal(Dest)).getAsRegion();<br>
<br>
Modified: cfe/trunk/test/Analysis/dtor.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/dtor.cpp?rev=170000&r1=169999&r2=170000&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/dtor.cpp?rev=170000&r1=169999&r2=170000&view=diff</a><br>

==============================================================================<br>
--- cfe/trunk/test/Analysis/dtor.cpp (original)<br>
+++ cfe/trunk/test/Analysis/dtor.cpp Wed Dec 12 13:13:44 2012<br>
@@ -301,3 +301,30 @@<br>
     obj->VirtualDtor::~VirtualDtor();<br>
   }<br>
 }<br>
+<br>
+<br>
+namespace MultidimensionalArrays {<br>
+  void testArrayInvalidation() {<br>
+    int i = 42;<br>
+    int j = 42;<br>
+<br>
+    {<br>
+      IntWrapper arr[2][2];<br>
+<br>
+      // There should be no undefined value warnings here.<br>
+      // Eventually these should be TRUE as well, but right now<br>
+      // we can't handle array constructors.<br>
+      clang_analyzer_eval(arr[0][0].x == 0); // expected-warning{{UNKNOWN}}<br>
+      clang_analyzer_eval(arr[1][1].x == 0); // expected-warning{{UNKNOWN}}<br>
+<br>
+      arr[0][0].x = &i;<br>
+      arr[1][1].x = &j;<br>
+      clang_analyzer_eval(*arr[0][0].x == 42); // expected-warning{{TRUE}}<br>
+      clang_analyzer_eval(*arr[1][1].x == 42); // expected-warning{{TRUE}}<br>
+    }<br>
+<br>
+    // The destructors should have invalidated i and j.<br>
+    clang_analyzer_eval(i == 42); // expected-warning{{UNKNOWN}}<br>
+    clang_analyzer_eval(j == 42); // expected-warning{{UNKNOWN}}<br>
+  }<br>
+}<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>