[all-commits] [llvm/llvm-project] 1f2a21: [NFCI] Refactor FormatterContainerPair into Tiered...

Jorge Gorbe Moya via All-commits all-commits at lists.llvm.org
Tue Sep 27 14:30:03 PDT 2022


  Branch: refs/heads/main
  Home:   https://github.com/llvm/llvm-project
  Commit: 1f2a21820dfa2c97de8cc9e09cd03cf1c1684e31
      https://github.com/llvm/llvm-project/commit/1f2a21820dfa2c97de8cc9e09cd03cf1c1684e31
  Author: Jorge Gorbe Moya <jgorbe at google.com>
  Date:   2022-09-27 (Tue, 27 Sep 2022)

  Changed paths:
    M lldb/include/lldb/DataFormatters/FormattersContainer.h
    M lldb/include/lldb/DataFormatters/TypeCategory.h
    M lldb/source/API/SBTypeCategory.cpp
    M lldb/source/DataFormatters/TypeCategory.cpp

  Log Message:
  -----------
  [NFCI] Refactor FormatterContainerPair into TieredFormatterContainer.

`FormatterContainerPair` is (as its name indicates) a very thin wrapper
over two formatter containers, one for exact matches and another one for
regex matches. The logic to decide which subcontainer to access is
replicated everywhere `FormatterContainerPair`s are used.

So, for example, when we look for a formatter there's some adhoc code
that does a lookup in the exact match formatter container, and if it
fails it does a lookup in the regex match formatter container. The same
logic is then copied and pasted for summaries, filters, and synthetic
child providers.

This change introduces a new `TieredFormatterContainer` that has two
main characteristics:

- It generalizes `FormatterContainerPair` from 2 to any number of
  subcontainers, that are looked up in priority order.
- It centralizes all the logic to choose which subcontainer to use for
  lookups, add/delete, and indexing.

This allows us to have a single copy of the same logic, templatized for
each kind of formatter. It also simplifies the upcoming addition of a
new tier of callback-based matches. See
https://discourse.llvm.org/t/rfc-python-callback-for-data-formatters-type-matching/64204
for more details about this.

The rest of the change is mostly replacing copy-pasted code with calls
to methods of the relevant `TieredFormatterContainer`, and adding some
methods to the `TypeCategoryImpl` class so we can remove some of this
copy-pasted code from `SBTypeCategory`.

Differential Revision: https://reviews.llvm.org/D133910




More information about the All-commits mailing list