[libcxxabi] r303806 - [Demangler] Remove a failing assert introduced in r303718

Erik Pilkington via cfe-commits cfe-commits at lists.llvm.org
Wed May 24 13:53:13 PDT 2017


Author: epilk
Date: Wed May 24 15:53:13 2017
New Revision: 303806

URL: http://llvm.org/viewvc/llvm-project?rev=303806&view=rev
Log:
[Demangler] Remove a failing assert introduced in r303718

Modified:
    libcxxabi/trunk/src/cxa_demangle.cpp

Modified: libcxxabi/trunk/src/cxa_demangle.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/src/cxa_demangle.cpp?rev=303806&r1=303805&r2=303806&view=diff
==============================================================================
--- libcxxabi/trunk/src/cxa_demangle.cpp (original)
+++ libcxxabi/trunk/src/cxa_demangle.cpp Wed May 24 15:53:13 2017
@@ -15,7 +15,6 @@
 #include <algorithm>
 #include <string>
 #include <numeric>
-#include <cassert>
 #include <cstdlib>
 #include <cstring>
 #include <cctype>
@@ -3034,8 +3033,7 @@ parse_unnamed_type_name(const char* firs
                     long k1 = static_cast<long>(db.names.size());
                     if (t1 == t0)
                         break;
-                    assert(k0 <= k1 && "parse_type() mutated the name stack");
-                    if (k1 == k0)
+                    if (k0 >= k1)
                         return first;
                     // If the call to parse_type above found a pack expansion
                     // substitution, then multiple names could have been




More information about the cfe-commits mailing list