I don't know how I did overlook this... Thanks for fixing.<br><br><div class="gmail_quote">2010/10/5 Zhongxing Xu <span dir="ltr"><<a href="mailto:xuzhongxing@gmail.com">xuzhongxing@gmail.com</a>></span><br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
Author: zhongxingxu<br>
Date: Tue Oct  5 03:38:06 2010<br>
New Revision: 115609<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=115609&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=115609&view=rev</a><br>
Log:<br>
* Simplify code<br>
* Fix dump() to make it consistent with the test case.<br>
<br>
Modified:<br>
    cfe/trunk/lib/Analysis/CFG.cpp<br>
<br>
Modified: cfe/trunk/lib/Analysis/CFG.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Analysis/CFG.cpp?rev=115609&r1=115608&r2=115609&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Analysis/CFG.cpp?rev=115609&r1=115608&r2=115609&view=diff</a><br>

==============================================================================<br>
--- cfe/trunk/lib/Analysis/CFG.cpp (original)<br>
+++ cfe/trunk/lib/Analysis/CFG.cpp Tue Oct  5 03:38:06 2010<br>
@@ -642,14 +642,14 @@<br>
   }<br>
<br>
   // Check if type is a C++ class with non-trivial destructor.<br>
-  if (const RecordType* RT = QT.getTypePtr()->getAs<RecordType>())<br>
-    if (const CXXRecordDecl* CD = dyn_cast<CXXRecordDecl>(RT->getDecl()))<br>
-      if (!CD->hasTrivialDestructor()) {<br>
-        // Add the variable to scope<br>
-        Scope = createOrReuseLocalScope(Scope);<br>
-        Scope->addVar(VD);<br>
-        ScopePos = Scope->begin();<br>
-      }<br>
+<br>
+  if (const CXXRecordDecl* CD = QT->getAsCXXRecordDecl())<br>
+    if (!CD->hasTrivialDestructor()) {<br>
+      // Add the variable to scope<br>
+      Scope = createOrReuseLocalScope(Scope);<br>
+      Scope->addVar(VD);<br>
+      ScopePos = Scope->begin();<br>
+    }<br>
   return Scope;<br>
 }<br>
<br>
@@ -2715,13 +2715,13 @@<br>
   } else if (CFGBaseDtor BE = E.getAs<CFGBaseDtor>()) {<br>
     const CXXBaseSpecifier *BS = BE.getBaseSpecifier();<br>
     OS << "~" << BS->getType()->getAsCXXRecordDecl()->getName() << "()";<br>
-    OS << " (Base destructor)\n";<br>
+    OS << " (Base object destructor)\n";<br>
<br>
   } else if (CFGMemberDtor ME = E.getAs<CFGMemberDtor>()) {<br>
     FieldDecl *FD = ME.getFieldDecl();<br>
     OS << "this->" << FD->getName();<br>
     OS << ".~" << FD->getType()->getAsCXXRecordDecl()->getName() << "()";<br>
-    OS << " (Member destructor)\n";<br>
+    OS << " (Member object destructor)\n";<br>
   }<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>