Michael137 updated this revision to Diff 503056.
Michael137 added a comment.
- Update commit message
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D145241/new/
https://reviews.llvm.org/D145241
Files:
lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
lldb/test/API/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py
lldb/test/Shell/SymbolFile/NativePDB/ast-types.cpp
Index: lldb/test/Shell/SymbolFile/NativePDB/ast-types.cpp
===================================================================
--- lldb/test/Shell/SymbolFile/NativePDB/ast-types.cpp
+++ lldb/test/Shell/SymbolFile/NativePDB/ast-types.cpp
@@ -131,15 +131,15 @@
// CHECK: (Anonymous<int>) AnonInt = (AnonymousMember = 0)
// CHECK: (Anonymous<A::B::C<void>>) AnonABCVoid = (AnonymousMember = 0)
// CHECK: (Anonymous<A::B::C<void>>::D) AnonABCVoidD = (AnonymousDMember = 0)
-// CHECK: (void (SI::*)()) mp1 = 00 00 00 00 00 00 00 00
-// CHECK: (void (MI::*)()) mp2 = 00 00 00 00 00 00 00 00
-// CHECK: (void (MI2::*)()) mp3 = 00 00 00 00 00 00 00 00
-// CHECK: (void (VI::*)()) mp4 = 00 00 00 00 00 00 00 00
-// CHECK: (void (VI2::*)()) mp5 = 00 00 00 00 00 00 00 00
-// CHECK: (void (UI::*)()) mp6 = 00 00 00 00 00 00 00 00
+// CHECK: (void (SI::*)()) mp1 = 0x0000000000000000
+// CHECK: (void (MI::*)()) mp2 = 0x0000000000000000
+// CHECK: (void (MI2::*)()) mp3 = 0x0000000000000000
+// CHECK: (void (VI::*)()) mp4 = 0x0000000000000000
+// CHECK: (void (VI2::*)()) mp5 = 0x0000000000000000
+// CHECK: (void (UI::*)()) mp6 = 0x0000000000000000
// CHECK: (void (MI::**)()) mp7 = 0x0000000000000000
// CHECK: (void (VI2::**)()) mp8 = 0x0000000000000000
-// CHECK: (int SI::*) mp9 = ff ff ff ff
+// CHECK: (int SI::*) mp9 = 0xffffffff
// CHECK: Dumping clang ast for 1 modules.
// CHECK: TranslationUnitDecl {{.*}}
// CHECK: |-CXXRecordDecl {{.*}} class TrivialC definition
Index:
lldb/test/API/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py
===================================================================
---
lldb/test/API/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py
+++
lldb/test/API/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py
@@ -294,13 +294,13 @@
# FIXME: don't format pointer to members as bytes, but rather as
regular pointers
self.expect(
"frame variable member_ptr",
- patterns=['member_ptr = [0-9a-z]{2}\s'])
+ patterns=['member_ptr = 0x[0-9a-z]+'])
self.expect(
"frame variable member_func_ptr",
- patterns=['member_func_ptr = [0-9a-z]{2}\s'])
+ patterns=['member_func_ptr = 0x[0-9a-z]+'])
self.expect(
"frame variable ref_to_member_func_ptr",
- patterns=['ref_to_member_func_ptr = [0-9a-z]{2}\s'])
+ patterns=['ref_to_member_func_ptr = 0x[0-9a-z]+'])
self.expect(
"frame variable virt_member_func_ptr",
- patterns=['virt_member_func_ptr = [0-9a-z]{2}\s'])
+ patterns=['virt_member_func_ptr = 0x[0-9a-z]+'])
Index: lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
===================================================================
--- lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
+++ lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
@@ -5277,7 +5277,7 @@
case clang::Type::RValueReference:
return lldb::eFormatHex;
case clang::Type::MemberPointer:
- break;
+ return lldb::eFormatHex;
case clang::Type::Complex: {
if (qual_type->isComplexType())
return lldb::eFormatComplex;
Index: lldb/test/Shell/SymbolFile/NativePDB/ast-types.cpp
===================================================================
--- lldb/test/Shell/SymbolFile/NativePDB/ast-types.cpp
+++ lldb/test/Shell/SymbolFile/NativePDB/ast-types.cpp
@@ -131,15 +131,15 @@
// CHECK: (Anonymous<int>) AnonInt = (AnonymousMember = 0)
// CHECK: (Anonymous<A::B::C<void>>) AnonABCVoid = (AnonymousMember = 0)
// CHECK: (Anonymous<A::B::C<void>>::D) AnonABCVoidD = (AnonymousDMember = 0)
-// CHECK: (void (SI::*)()) mp1 = 00 00 00 00 00 00 00 00
-// CHECK: (void (MI::*)()) mp2 = 00 00 00 00 00 00 00 00
-// CHECK: (void (MI2::*)()) mp3 = 00 00 00 00 00 00 00 00
-// CHECK: (void (VI::*)()) mp4 = 00 00 00 00 00 00 00 00
-// CHECK: (void (VI2::*)()) mp5 = 00 00 00 00 00 00 00 00
-// CHECK: (void (UI::*)()) mp6 = 00 00 00 00 00 00 00 00
+// CHECK: (void (SI::*)()) mp1 = 0x0000000000000000
+// CHECK: (void (MI::*)()) mp2 = 0x0000000000000000
+// CHECK: (void (MI2::*)()) mp3 = 0x0000000000000000
+// CHECK: (void (VI::*)()) mp4 = 0x0000000000000000
+// CHECK: (void (VI2::*)()) mp5 = 0x0000000000000000
+// CHECK: (void (UI::*)()) mp6 = 0x0000000000000000
// CHECK: (void (MI::**)()) mp7 = 0x0000000000000000
// CHECK: (void (VI2::**)()) mp8 = 0x0000000000000000
-// CHECK: (int SI::*) mp9 = ff ff ff ff
+// CHECK: (int SI::*) mp9 = 0xffffffff
// CHECK: Dumping clang ast for 1 modules.
// CHECK: TranslationUnitDecl {{.*}}
// CHECK: |-CXXRecordDecl {{.*}} class TrivialC definition
Index: lldb/test/API/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py
===================================================================
--- lldb/test/API/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py
+++ lldb/test/API/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py
@@ -294,13 +294,13 @@
# FIXME: don't format pointer to members as bytes, but rather as regular pointers
self.expect(
"frame variable member_ptr",
- patterns=['member_ptr = [0-9a-z]{2}\s'])
+ patterns=['member_ptr = 0x[0-9a-z]+'])
self.expect(
"frame variable member_func_ptr",
- patterns=['member_func_ptr = [0-9a-z]{2}\s'])
+ patterns=['member_func_ptr = 0x[0-9a-z]+'])
self.expect(
"frame variable ref_to_member_func_ptr",
- patterns=['ref_to_member_func_ptr = [0-9a-z]{2}\s'])
+ patterns=['ref_to_member_func_ptr = 0x[0-9a-z]+'])
self.expect(
"frame variable virt_member_func_ptr",
- patterns=['virt_member_func_ptr = [0-9a-z]{2}\s'])
+ patterns=['virt_member_func_ptr = 0x[0-9a-z]+'])
Index: lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
===================================================================
--- lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
+++ lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
@@ -5277,7 +5277,7 @@
case clang::Type::RValueReference:
return lldb::eFormatHex;
case clang::Type::MemberPointer:
- break;
+ return lldb::eFormatHex;
case clang::Type::Complex: {
if (qual_type->isComplexType())
return lldb::eFormatComplex;
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
