From: Simon Marchi Date: Wed, 20 Jan 2016 18:42:53 +0000 (-0500) Subject: Fix sorting of enum values in FlagEnumerationPrinter X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5f5dfff63f31511db45278f97dc22059325ec4d6;p=binutils-gdb.git Fix sorting of enum values in FlagEnumerationPrinter The lambda function used to sort the enumerator list does not work properly. This list consists of tuples, (enum label, enum value). The key function returns x.enumval. enumval not being defined for a tuple, we see this exception in the test log: Python Exception 'tuple' object has no attribute 'enumval' The function should return the second item of the tuple, which is the enumval. The pretty-printer still worked mostly correctly, except that the enumeration values were not sorted. The test still passed because the enumeration values are already sorted where they are defined. The test also passed despite the exception being printed, because the right output was printed after the exception: print (enum flag_enum) (FLAG_1) Python Exception 'tuple' objecthas no attribute 'enumval':M $7 = 0x1 [FLAG_1] (gdb) PASS: gdb.python/py-pp-maint.exp: print FLAG_1 New in v2: - Improved test case, I stole Pedro's example directly. It verifies that the sorting of enumerators by value works, by checking that printing FOO_MASK appears as FOO_1 | FOO_2 | FOO_3. I noticed that I could change the regexps to almost anything and the tests would still pass. I think it was because of the | in there. I made them more robust by using string_to_regexp. I used curly braces { } instead of quoting marks " " for strings, so that I could use square brackets [ ] in them without having to escape them all. I also removed the "message" part of the tests, since they are redundant with the command, and it's just more maintenance to have to update them. Tested with Python 2.7 and 3.5. gdb/ChangeLog: * python/lib/gdb/printing.py (FlagEnumerationPrinter.__call__): Fix enumerators sort key function. gdb/testsuite/ChangeLog: * gdb.python/py-pp-maint.exp: Change/add enum flag tests. * gdb.python/py-pp-maint.c (enum flag_enum): Use more complex enum flag values. --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 937f8ac9410..705c2e146f0 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2016-01-20 Simon Marchi + + * python/lib/gdb/printing.py (FlagEnumerationPrinter.__call__): + Fix enumerators sort key function. + 2016-01-20 Joel Brobecker * printcmd.c (print_scalar_formatted): Move binary operator from diff --git a/gdb/python/lib/gdb/printing.py b/gdb/python/lib/gdb/printing.py index 5160581a5b2..63c3aeb23d8 100644 --- a/gdb/python/lib/gdb/printing.py +++ b/gdb/python/lib/gdb/printing.py @@ -263,7 +263,7 @@ class FlagEnumerationPrinter(PrettyPrinter): self.enumerators.append((field.name, field.enumval)) # Sorting the enumerators by value usually does the right # thing. - self.enumerators.sort(key = lambda x: x.enumval) + self.enumerators.sort(key = lambda x: x[1]) if self.enabled: return _EnumInstance(self.enumerators, val) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 3485cfe555c..7e6da03c94c 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2016-01-20 Simon Marchi + + * gdb.python/py-pp-maint.exp: Change/add enum flag tests. + * gdb.python/py-pp-maint.c (enum flag_enum): Use more complex + enum flag values. + 2016-01-20 Andreas Arnez * gdb.base/gnu_vector.exp: Re-establish handling for should_kfail diff --git a/gdb/testsuite/gdb.python/py-pp-maint.c b/gdb/testsuite/gdb.python/py-pp-maint.c index 657dfd7c19b..d750496ff7d 100644 --- a/gdb/testsuite/gdb.python/py-pp-maint.c +++ b/gdb/testsuite/gdb.python/py-pp-maint.c @@ -17,12 +17,20 @@ #include + enum flag_enum { - FLAG_1 = 1, - FLAG_2 = 2, - FLAG_3 = 4, - ALL = FLAG_1 | FLAG_2 | FLAG_3 + /* Define the enumeration values in an unsorted manner to verify that we + effectively sort them by value. */ + FOO_MASK = 0x07, + FOO_1 = 0x01, + FOO_2 = 0x02, + FOO_3 = 0x04, + + BAR_MASK = 0x70, + BAR_1 = 0x10, + BAR_2 = 0x20, + BAR_3 = 0x40, }; enum flag_enum fval; diff --git a/gdb/testsuite/gdb.python/py-pp-maint.exp b/gdb/testsuite/gdb.python/py-pp-maint.exp index db0768f86c0..a424931078c 100644 --- a/gdb/testsuite/gdb.python/py-pp-maint.exp +++ b/gdb/testsuite/gdb.python/py-pp-maint.exp @@ -119,14 +119,23 @@ gdb_test "print flt" " = x=<42> y=<43>" \ gdb_test "print ss" " = a= b=<$hex>> b= b=<$hex>>" \ "print ss re-enabled" -gdb_test "print (enum flag_enum) (FLAG_1)" \ - " = 0x1 .FLAG_1." \ - "print FLAG_1" +gdb_test_exact "print (enum flag_enum) (FOO_1)" \ + { = 0x1 [FOO_1]} -gdb_test "print (enum flag_enum) (FLAG_1 | FLAG_3)" \ - " = 0x5 .FLAG_1 | FLAG_3." \ - "print FLAG_1 | FLAG_3" +gdb_test_exact "print (enum flag_enum) (BAR_3)" \ + { = 0x40 [BAR_3]} -gdb_test "print (enum flag_enum) (4 + 8)" \ - " = 0xc .FLAG_1 | ." \ - "print FLAG_1 | 8" +gdb_test_exact "print (enum flag_enum) (BAR_2 | FOO_2)" \ + { = 0x22 [FOO_2 | BAR_2]} + +gdb_test_exact "print (enum flag_enum) (FOO_1 | FOO_2 | FOO_3)" \ + { = 0x7 [FOO_1 | FOO_2 | FOO_3]} + +gdb_test_exact "print (enum flag_enum) (FOO_MASK)" \ + { = 0x7 [FOO_1 | FOO_2 | FOO_3]} + +gdb_test_exact "print (enum flag_enum) (FOO_MASK | (BAR_MASK & ~BAR_2))" \ + { = 0x57 [FOO_1 | FOO_2 | FOO_3 | BAR_1 | BAR_3]} + +gdb_test_exact "print (enum flag_enum) (0x4 + 0x8)" \ + { = 0xc [FOO_3 | ]}