Re-enable libc++ gdb-pretty-printer tests for all versions of clang.

[saugustine]

Summary

The bootstrap tests were failing because the environment has a version
of gdb too old to read dwarf5 as generated by clang. The problem isn't
just pretty printer tests--this version of gdb will fail to read any
program compiled with those versions of clang.

More discussion here:

https://discourse.llvm.org/t/gdb-10-1-cant-read-clangs-dwarf-v5/6035/11

[Mordante]

Note the pre-commit CI uses Ubuntu 20.04 which contains gdb 9.1. Ubuntu 22.04 has just been released, @ldionne how do you feel about moving the CI to Ubuntu 22.04?

Alternatively we can try to add -gdwarf-4 to the RUN line.

[ldionne]

In D124569#3479235, @Mordante wrote:

Note the pre-commit CI uses Ubuntu 20.04 which contains gdb 9.1. Ubuntu 22.04 has just been released, @ldionne how do you feel about moving the CI to Ubuntu 22.04?

Alternatively we can try to add -gdwarf-4 to the RUN line.

I'm fine with moving to Ubuntu 22.04! As you know, however, platform updates are not always super smooth for the CI, so I think it may be good to do it over the week-end.

[ldionne]

This LGTM once we've moved to Ubuntu 22.04. Please wait for that and then rebase to you can get a clean CI run.

[ldionne]

We have now moved to Ubuntu 22.04, let's rebase this and give it a shot. We've been seeing issues with these tests so it might help.

[saugustine]

I can't manage to get the buildbot environment working to test this. It consistently fails with

clang: error: unable to execute command: posix_spawn failed: Operation not permitted

Not sure the best thing to do here. I think it should work fine, but am stumped on how to test it.

[Mordante]

In D124569#3578931, @saugustine wrote:

I can't manage to get the buildbot environment working to test this. It consistently fails with

clang: error: unable to execute command: posix_spawn failed: Operation not permitted

Not sure the best thing to do here. I think it should work fine, but am stumped on how to test it.

Can you rebase the patch so we can see the exact errors in our CI.
Note there are probably some merge conflicts since I added more builds to the exception list.

[saugustine]

Rebased changes

[Mordante]

Thanks! I see different errors now. I'll see what I can do about it. At the moment our CI is rather unstable so I'll look at it when that's fixed.

libcxx/test/libcxx/gdb/gdb_pretty_printer_test.sh.cpp

15

This hunk can probably also be removed. But I'll investigate the build issue first.

[dblaikie]

@Mordante ping on this - be nice to get this back up and running since the pretty printers have regressed recently (string_view regressed/broke due to a member rename from data to data_)

[saugustine]

Circling back to this.

Reenable libc++ gdb-pretty-printer tests
_and_ update the pretty printer for bitrot.

Will push this shortly as we had already agree it should be done.

[saugustine]

Committed as e4d5daaf91f6719626fa36c75e553e91778b94a9

[daltenty]

Seems like this is breaking in the libc++ CI: https://buildkite.com/llvm-project/libcxx-ci/builds/14027

[dblaikie]

In D124569#3852532, @daltenty wrote:

Seems like this is breaking in the libc++ CI: https://buildkite.com/llvm-project/libcxx-ci/builds/14027

looks like this came good one way or another? (at least I see some recent green runs)

libcxx/test/libcxx/gdb/gdb_pretty_printer_test.sh.cpp

 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 // REQUIRES: host-has-gdb-with-python
 // REQUIRES: locale.en_US.UTF-8
 // UNSUPPORTED: no-localization
 // UNSUPPORTED: c++03
 
-// TODO: Investigate this failure, which happens only with the Bootstrapping build.
-// UNSUPPORTED: clang-14, clang-15, clang-16
-
 // TODO: Investigate this failure on GCC 12 (in Ubuntu Jammy)
 // UNSUPPORTED: gcc-12
 
 // RUN: %{cxx} %{flags} %s -o %t.exe %{compile_flags} -g %{link_flags}
 // Ensure locale-independence for unicode tests.
 // RUN: env LANG=en_US.UTF-8 %{gdb} -nx -batch -iex "set autoload off" -ex "source %S/../../../utils/gdb/libcxx/printers.py" -ex "python register_libcxx_printer_loader()" -ex "source %S/gdb_pretty_printer_test.py" %t.exe
 
 #include <bitset>
 #include <deque>
 #include <list>

libcxx/utils/gdb/libcxx/printers.py

def _remove_generics(typename):
     Returns:
       The prefix up to the generic part, such as std::my_collection.
     """
 
     match = re.match("^([^<]+)", typename)
     return match.group(1)
 
 
+def _cc_field(node):
+    """Previous versions of libcxx had inconsistent field naming naming. Handle
+    both types.
+    """
+    try:
+        return node["__value_"]["__cc_"]
+    except:
+        return node["__value_"]["__cc"]
+
+
+def _data_field(node):
+    """Previous versions of libcxx had inconsistent field naming naming. Handle
+    both types.
+    """
+    try:
+        return node["__data_"]
+    except:
+        return node["__data"]
+
+
+def _size_field(node):
+    """Previous versions of libcxx had inconsistent field naming naming. Handle
+    both types.
+    """
+    try:
+        return node["__size_"]
+    except:
+        return node["__size"]
+
+
 # Some common substitutions on the types to reduce visual clutter (A user who
 # wants to see the actual details can always use print/r).
 _common_substitutions = [
     ("std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
      "std::string"),
     ("std::basic_string_view<char, std::char_traits<char> >",
      "std::string_view"),
 ]

 class StdStringPrinter(object):
     """Print a std::string."""
 
     def __init__(self, val):
         self.val = val
 
     def to_string(self):
         """Build a python string from the data whether stored inline or separately."""
-
         value_field = _value_of_pair_first(self.val["__r_"])
         short_field = value_field["__s"]
         short_size = short_field["__size_"]
-        if short_size == 0:
-            return ""
         if short_field["__is_long_"]:
             long_field = value_field["__l"]
             data = long_field["__data_"]
             size = long_field["__size_"]
         else:
             data = short_field["__data_"]
             size = short_field["__size_"]
         return data.lazy_string(length=size)
def __init__(self, val):
       self.val = val
 
     def display_hint(self):
       return "string"
 
     def to_string(self):  # pylint: disable=g-bad-name
       """GDB calls this to compute the pretty-printed form."""
 
-      ptr = self.val["__data"]
+      ptr = _data_field(self.val)
       ptr = ptr.cast(ptr.type.target().strip_typedefs().pointer())
-      size = self.val["__size"]
+      size = _size_field(self.val)
       return ptr.lazy_string(length=size)
 
 
 class StdUniquePtrPrinter(object):
     """Print a std::unique_ptr."""
 
     def __init__(self, val):
         self.val = val
def _init_cast_type(self, val_type):
         tree_it_type = map_it_type.template_argument(0)
         node_ptr_type = tree_it_type.template_argument(1)
         return node_ptr_type
 
     def display_hint(self):
         return "map"
 
     def _get_key_value(self, node):
-        key_value = node.cast(self.util.cast_type).dereference()[
-            "__value_"]["__cc"]
+        key_value = _cc_field(node.cast(self.util.cast_type).dereference())
         return [key_value["first"], key_value["second"]]
 
 
 class StdSetPrinter(AbstractRBTreePrinter):
     """Print a std::set."""
 
     def _init_cast_type(self, val_type):
         set_it_type = gdb.lookup_type(

 class MapIteratorPrinter(AbstractRBTreeIteratorPrinter):
     """Print a std::(multi)map iterator."""
 
     def __init__(self, val):
         self._initialize(val["__i_"],
                          _remove_generics(_prettify_typename(val.type)))
 
     def _get_node_value(self, node):
-        return node["__value_"]["__cc"]
+        return _cc_field(node)
 
 
 class SetIteratorPrinter(AbstractRBTreeIteratorPrinter):
     """Print a std::(multi)set iterator."""
 
     def __init__(self, val):
         self._initialize(val, _remove_generics(_prettify_typename(val.type)))
 
class StdUnorderedSetPrinter(AbstractUnorderedCollectionPrinter):
     def display_hint(self):
         return "array"
 
 
 class StdUnorderedMapPrinter(AbstractUnorderedCollectionPrinter):
     """Print a std::unordered_(multi)map."""
 
     def _get_key_value(self, node):
-        key_value = node["__value_"]["__cc"]
+        key_value = _cc_field(node)
         return [key_value["first"], key_value["second"]]
 
     def display_hint(self):
         return "map"
 
 
 class AbstractHashMapIteratorPrinter(object):
     """Abstract class for unordered collection iterators."""

 class StdUnorderedMapIteratorPrinter(AbstractHashMapIteratorPrinter):
     """Print a std::(multi)map iterator."""
 
     def __init__(self, val):
         self.cast_type = val.type.template_argument(0).template_argument(0)
         self._initialize(val, val["__i_"]["__node_"])
 
     def _get_key_value(self):
-        key_value = self.node["__value_"]["__cc"]
+        key_value = _cc_field(self.node)
         return [key_value["first"], key_value["second"]]
 
     def display_hint(self):
         return "map"
 
 
 def _remove_std_prefix(typename):
     match = re.match("^std::(.+)", typename)