[clang] 4c10d65 - [AIX] Support two itanium alignment LIT testcases for AIX using regex

[Xiangling Liao via cfe-commits]

Author: Xiangling Liao
Date: 2020-10-13T16:47:01-04:00
New Revision: 4c10d6508f546ee986df0994663984cb15354c08

URL: https://github.com/llvm/llvm-project/commit/4c10d6508f546ee986df0994663984cb15354c08
DIFF: https://github.com/llvm/llvm-project/commit/4c10d6508f546ee986df0994663984cb15354c08.diff

LOG: [AIX] Support two itanium alignment LIT testcases for AIX using regex

AIX has different layout dumping format from other itanium ABIs.
And for these two cases, use regex to match AIX format.

Differential Revision: https://reviews.llvm.org/D89064

Added: 
    

Modified: 
    clang/test/Layout/itanium-pack-and-align.cpp
    clang/test/Layout/itanium-union-bitfield.cpp

Removed: 
    


################################################################################
diff  --git a/clang/test/Layout/itanium-pack-and-align.cpp b/clang/test/Layout/itanium-pack-and-align.cpp
index ac64979af33b..94a35448db61 100644
--- a/clang/test/Layout/itanium-pack-and-align.cpp
+++ b/clang/test/Layout/itanium-pack-and-align.cpp
@@ -16,11 +16,11 @@ T t;
 // CHECK:          0 | struct T
 // CHECK-NEXT:          0 |   char x
 // CHECK-NEXT:          1 |   int y
-// CHECK-NEXT:            | [sizeof=8, dsize=8, align=8,
-// CHECK-NEXT:            |  nvsize=8, nvalign=8]
+// CHECK-NEXT:            | [sizeof=8, dsize=8, align=8,{{( preferredalign=8,)?}}
+// CHECK-NEXT:            |  nvsize=8, nvalign=8{{(, preferrednvalign=8)?}}]
 
 // CHECK:          0 | struct S
 // CHECK-NEXT:          0 |   char x
 // CHECK-NEXT:          1 |   int y
-// CHECK-NEXT:            | [sizeof=8, dsize=8, align=8,
-// CHECK-NEXT:            |  nvsize=8, nvalign=8]
+// CHECK-NEXT:            | [sizeof=8, dsize=8, align=8,{{( preferredalign=8,)?}}
+// CHECK-NEXT:            |  nvsize=8, nvalign=8{{(, preferrednvalign=8)?}}]

diff  --git a/clang/test/Layout/itanium-union-bitfield.cpp b/clang/test/Layout/itanium-union-bitfield.cpp
index 289a565359e9..961bf5b6f3b4 100644
--- a/clang/test/Layout/itanium-union-bitfield.cpp
+++ b/clang/test/Layout/itanium-union-bitfield.cpp
@@ -18,12 +18,11 @@ B::B() {}
 // CHECK:*** Dumping AST Record Layout
 // CHECK-NEXT:     0 | union A
 // CHECK-NEXT: 0:0-2 |   int f1
-// CHECK-NEXT:       | [sizeof=4, dsize=1, align=4
-// CHECK-NEXT:       |  nvsize=1, nvalign=4]
+// CHECK-NEXT:       | [sizeof=4, dsize=1, align=4{{(, preferredalign=4,)?}}
+// CHECK-NEXT:       |  nvsize=1, nvalign=4{{(, preferrednvalign=4)?}}]
 
 // CHECK:*** Dumping AST Record Layout
 // CHECK-NEXT:      0 | union B
 // CHECK-NEXT: 0:0-34 |   char f1
-// CHECK-NEXT:        | [sizeof=8, dsize=5, align=4
-// CHECK-NEXT:        |  nvsize=5, nvalign=4]
-
+// CHECK-NEXT:        | [sizeof=8, dsize=5, align=4{{(, preferredalign=4,)?}}
+// CHECK-NEXT:        |  nvsize=5, nvalign=4{{(, preferrednvalign=4)?}}]