diff --git a/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp b/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp --- a/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp +++ b/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; diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py b/lldb/test/API/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py --- a/lldb/test/API/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py +++ b/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]+']) diff --git a/lldb/test/Shell/SymbolFile/NativePDB/ast-types.cpp b/lldb/test/Shell/SymbolFile/NativePDB/ast-types.cpp --- a/lldb/test/Shell/SymbolFile/NativePDB/ast-types.cpp +++ b/lldb/test/Shell/SymbolFile/NativePDB/ast-types.cpp @@ -131,15 +131,15 @@ // CHECK: (Anonymous) AnonInt = (AnonymousMember = 0) // CHECK: (Anonymous>) AnonABCVoid = (AnonymousMember = 0) // CHECK: (Anonymous>::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