Author: Pavel Labath Date: 2022-01-06T19:52:24+01:00 New Revision: 31c7165a2bd69e07b916434a50826860132ba75f
URL: https://github.com/llvm/llvm-project/commit/31c7165a2bd69e07b916434a50826860132ba75f DIFF: https://github.com/llvm/llvm-project/commit/31c7165a2bd69e07b916434a50826860132ba75f.diff LOG: [lldb] Remove summary for signed char * It conflicts with the summary for BOOL * (aka signed char *). This partially reverts D112709. Added: Modified: lldb/source/DataFormatters/FormatManager.cpp lldb/test/API/functionalities/data-formatter/stringprinter/main.cpp lldb/test/API/lang/c/flexible-array-members/TestCFlexibleArrayMembers.py Removed: ################################################################################ diff --git a/lldb/source/DataFormatters/FormatManager.cpp b/lldb/source/DataFormatters/FormatManager.cpp index 0ef5f0adc8327..f07bb9a7136a3 100644 --- a/lldb/source/DataFormatters/FormatManager.cpp +++ b/lldb/source/DataFormatters/FormatManager.cpp @@ -730,7 +730,7 @@ void FormatManager::LoadSystemFormatters() { GetCategory(m_system_category_name); sys_category_sp->GetRegexTypeSummariesContainer()->Add( - RegularExpression(R"(^((un)?signed )?char ?(\*|\[\])$)"), string_format); + RegularExpression(R"(^(unsigned )?char ?(\*|\[\])$)"), string_format); sys_category_sp->GetRegexTypeSummariesContainer()->Add( std::move(any_size_char_arr), string_array_format); diff --git a/lldb/test/API/functionalities/data-formatter/stringprinter/main.cpp b/lldb/test/API/functionalities/data-formatter/stringprinter/main.cpp index b6886ea7f2052..ff833da0b7a8a 100644 --- a/lldb/test/API/functionalities/data-formatter/stringprinter/main.cpp +++ b/lldb/test/API/functionalities/data-formatter/stringprinter/main.cpp @@ -62,7 +62,7 @@ int main (int argc, char const *argv[]) //% //% for c in ["", "const"]: //% for v in ["", "volatile"]: - //% for s in ["", "signed", "unsigned"]: + //% for s in ["", "unsigned"]: //% summary = '"'+c+v+s+'char"' //% self.expect_var_path(c+v+s+"chararray", summary=summary) //% # These should be printed normally diff --git a/lldb/test/API/lang/c/flexible-array-members/TestCFlexibleArrayMembers.py b/lldb/test/API/lang/c/flexible-array-members/TestCFlexibleArrayMembers.py index a95fa34b3766c..b866786634058 100644 --- a/lldb/test/API/lang/c/flexible-array-members/TestCFlexibleArrayMembers.py +++ b/lldb/test/API/lang/c/flexible-array-members/TestCFlexibleArrayMembers.py @@ -18,7 +18,7 @@ def test(self): lldb.SBFileSpec("main.c")) self.expect_var_path("c->flexible", type="char[]", summary='"contents"') - self.expect_var_path("sc->flexible", type="signed char[]", summary='"contents"') + # self.expect_var_path("sc->flexible", type="signed char[]", summary='"contents"') self.expect_var_path("uc->flexible", type="unsigned char[]", summary='"contents"') # TODO: Make this work self.expect("expr c->flexible", error=True, _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
