[Lldb-commits] [lldb] r198811 - Roll back r198729; it seems to be causing two testsuite failures if llvm is built with asserts -

[Jason Molenda]

Author: jmolenda
Date: Wed Jan  8 18:02:17 2014
New Revision: 198811

URL: http://llvm.org/viewvc/llvm-project?rev=198811&view=rev
Log:
Roll back r198729; it seems to be causing two testsuite failures if llvm is built with asserts -

210: test_with_dsym_and_run_command (Test-rdar-10642615.Radar10642615DataFormatterTestCase)
     Test data formatter commands. ... Assertion failed: (isa<X>(Val) && "cast<Ty>() argument of incompatible type!"), function cast, file llvm/include/llvm/Support/Casting.h, line 239.

     226: test_with_dsym_and_run_command (Test-rdar-13338477.Radar13338477DataFormatterTestCase)
         Test that LLDB handles the clang typeclass Paren correctly. ... Assertion failed: (isa<X>(Val) && "cast<Ty>() argument of incompatible type!"), function cast, file llvm/include/llvm/Support/Casting.h, line 239.

Modified:
    lldb/trunk/source/Symbol/ClangASTType.cpp

Modified: lldb/trunk/source/Symbol/ClangASTType.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/ClangASTType.cpp?rev=198811&r1=198810&r2=198811&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/ClangASTType.cpp (original)
+++ lldb/trunk/source/Symbol/ClangASTType.cpp Wed Jan  8 18:02:17 2014
@@ -3245,7 +3245,7 @@ ClangASTType::GetChildClangTypeAtIndex (
         case clang::Type::ExtVector:
             if (idx_is_valid)
             {
-                const VectorType *array = cast<VectorType>(GetQualType().getTypePtr());
+                const VectorType *array = cast<VectorType>(parent_qual_type.getTypePtr());
                 if (array)
                 {
                     ClangASTType element_type (m_ast, array->getElementType());
@@ -3266,7 +3266,7 @@ ClangASTType::GetChildClangTypeAtIndex (
         case clang::Type::IncompleteArray:
             if (ignore_array_bounds || idx_is_valid)
             {
-                const ArrayType *array = cast<ArrayType>(GetQualType().getTypePtr());
+                const ArrayType *array = cast<ArrayType>(parent_qual_type.getTypePtr());
                 if (array)
                 {
                     ClangASTType element_type (m_ast, array->getElementType());