[Lldb-commits] [PATCH] D128668: [LLDB] Fix PDB/pointers.test for 32bit Arm/Windows

[Muhammad Omair Javaid via Phabricator via lldb-commits]

omjavaid created this revision.
omjavaid added reviewers: mstorsjo, DavidSpickett.
Herald added subscribers: jsji, pengfei, kristof.beyls.
Herald added a project: All.
omjavaid requested review of this revision.

PDB/pointers.test was orignally written for 32bit x86 keeping in mind

  __cdecl and __stdcall calling conventions which does name mangling for
  example like adding "_" underscore before function name.
  This is only x86 specific but purpose of pointers.test is NOT to test
  calling convention.
  I am have made a few minor changes to this test which will make it pass
  when run on Windows/Arm platform.


https://reviews.llvm.org/D128668

Files:
  lldb/test/Shell/SymbolFile/PDB/pointers.test


Index: lldb/test/Shell/SymbolFile/PDB/pointers.test
===================================================================
--- lldb/test/Shell/SymbolFile/PDB/pointers.test
+++ lldb/test/Shell/SymbolFile/PDB/pointers.test
@@ -19,7 +19,7 @@
 MAIN-ST-NEXT: int {{.*}}f(int);
 MAIN-ST-NEXT:}
 
-MAIN:   Function{[[FID1:.*]]}, mangled = _main
+MAIN:   Function{[[FID1:.*]]}, mangled = {{_?}}main
 MAIN-NEXT:  Block{[[FID1]]}
 MAIN:     Variable{{.*}}, name = "array_pointer"
 MAIN-SAME:    (int (*)[2][4]), scope = local
@@ -28,11 +28,11 @@
 MAIN:     Variable{{.*}}, name = "p_member_field"
 MAIN-SAME:    (int ST::*), scope = local
 MAIN:     Variable{{.*}}, name = "p_member_method"
-MAIN-SAME:    (int (ST::*)(int) __attribute__((thiscall))), scope = local
+MAIN-SAME:    (int (ST::*)(int){{( __attribute__\(\(thiscall\)\))?}}), scope = local
 
 F:   Function{[[FID2:.*]]}, demangled = {{.*}}f(int)
 F-NEXT:  Block{[[FID2]]}
 F:     Variable{{.*}}, name = "this"
-F-SAME:    (ST *), scope = parameter, location = {{.*}}, artificial
+F-SAME:    (ST *), scope = parameter,{{( location = DW_OP.*,)?}} artificial
 F:     Variable{{.*}}, name = "x"
 F-SAME:    (int), scope = parameter, decl = PointerTypeTest.cpp:8


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D128668.440297.patch
Type: text/x-patch
Size: 1207 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20220627/10478796/attachment.bin>