[llvm] [lldb] Allow lldbDataFormatters.py to be used by other names (NFC) (PR #65528)

Dave Lee via llvm-commits llvm-commits at lists.llvm.org
Wed Sep 6 13:29:04 PDT 2023


https://github.com/kastiglione created https://github.com/llvm/llvm-project/pull/65528:

Instead of hard-coding the name `lldbDataFormatters`, use `__name__` to get the module's name.

This allows the formatters to be loaded from any path, with any filename.

>From 7cd556f4ea7573b911def30c04b3788e328f10f0 Mon Sep 17 00:00:00 2001
From: Dave Lee <davelee.com at gmail.com>
Date: Wed, 6 Sep 2023 13:21:16 -0700
Subject: [PATCH] [lldb] Allow lldbDataFormatters.py to be used by other names
 (NFC)

---
 llvm/utils/lldbDataFormatters.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/llvm/utils/lldbDataFormatters.py b/llvm/utils/lldbDataFormatters.py
index 8e0e7e1c0c5121..0b61db60e80c7f 100644
--- a/llvm/utils/lldbDataFormatters.py
+++ b/llvm/utils/lldbDataFormatters.py
@@ -13,7 +13,7 @@ def __lldb_init_module(debugger, internal_dict):
     debugger.HandleCommand("type category define -e llvm -l c++")
     debugger.HandleCommand(
         "type synthetic add -w llvm "
-        "-l lldbDataFormatters.SmallVectorSynthProvider "
+        f"-l {__name__}.SmallVectorSynthProvider "
         '-x "^llvm::SmallVectorImpl<.+>$"'
     )
     debugger.HandleCommand(
@@ -23,7 +23,7 @@ def __lldb_init_module(debugger, internal_dict):
     )
     debugger.HandleCommand(
         "type synthetic add -w llvm "
-        "-l lldbDataFormatters.SmallVectorSynthProvider "
+        f"-l {__name__}.SmallVectorSynthProvider "
         '-x "^llvm::SmallVector<.+,.+>$"'
     )
     debugger.HandleCommand(
@@ -33,7 +33,7 @@ def __lldb_init_module(debugger, internal_dict):
     )
     debugger.HandleCommand(
         "type synthetic add -w llvm "
-        "-l lldbDataFormatters.ArrayRefSynthProvider "
+        f"-l {__name__}.ArrayRefSynthProvider "
         '-x "^llvm::ArrayRef<.+>$"'
     )
     debugger.HandleCommand(
@@ -43,27 +43,27 @@ def __lldb_init_module(debugger, internal_dict):
     )
     debugger.HandleCommand(
         "type synthetic add -w llvm "
-        "-l lldbDataFormatters.OptionalSynthProvider "
+        f"-l {__name__}.OptionalSynthProvider "
         '-x "^llvm::Optional<.+>$"'
     )
     debugger.HandleCommand(
         "type summary add -w llvm "
-        "-e -F lldbDataFormatters.OptionalSummaryProvider "
+        f"-e -F {__name__}.OptionalSummaryProvider "
         '-x "^llvm::Optional<.+>$"'
     )
     debugger.HandleCommand(
         "type summary add -w llvm "
-        "-F lldbDataFormatters.SmallStringSummaryProvider "
+        f"-F {__name__}.SmallStringSummaryProvider "
         '-x "^llvm::SmallString<.+>$"'
     )
     debugger.HandleCommand(
         "type summary add -w llvm "
-        "-F lldbDataFormatters.StringRefSummaryProvider "
+        f"-F {__name__}.StringRefSummaryProvider "
         "llvm::StringRef"
     )
     debugger.HandleCommand(
         "type summary add -w llvm "
-        "-F lldbDataFormatters.ConstStringSummaryProvider "
+        f"-F {__name__}.ConstStringSummaryProvider "
         "lldb_private::ConstString"
     )
 
@@ -72,23 +72,23 @@ def __lldb_init_module(debugger, internal_dict):
     # non-pointer types that instead specialize PointerLikeTypeTraits.
     # debugger.HandleCommand(
     #     "type synthetic add -w llvm "
-    #     "-l lldbDataFormatters.PointerIntPairSynthProvider "
+    #     f"-l {__name__}.PointerIntPairSynthProvider "
     #     '-x "^llvm::PointerIntPair<.+>$"'
     # )
     # debugger.HandleCommand(
     #     "type synthetic add -w llvm "
-    #     "-l lldbDataFormatters.PointerUnionSynthProvider "
+    #     f"-l {__name__}.PointerUnionSynthProvider "
     #     '-x "^llvm::PointerUnion<.+>$"'
     # )
 
     debugger.HandleCommand(
         "type summary add -w llvm "
-        "-e -F lldbDataFormatters.DenseMapSummary "
+        f"-e -F {__name__}.DenseMapSummary "
         '-x "^llvm::DenseMap<.+>$"'
     )
     debugger.HandleCommand(
         "type synthetic add -w llvm "
-        "-l lldbDataFormatters.DenseMapSynthetic "
+        f"-l {__name__}.DenseMapSynthetic "
         '-x "^llvm::DenseMap<.+>$"'
     )
 



More information about the llvm-commits mailing list