From: Richard Smith <richard-llvm@metafoo.co.uk>
Date: Tue, 27 Sep 2016 00:52:29 +0000 (+0000)
Subject: Defend test against differences between 32-bit and 64-bit MSABI manglings.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e2011000bb0ee0f344b5904259192c358fd8321d;p=clang

Defend test against differences between 32-bit and 64-bit MSABI manglings.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@282463 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/test/CodeGenCXX/cxx1z-eval-order.cpp b/test/CodeGenCXX/cxx1z-eval-order.cpp
index 655f9a5ee0..f6cfb2b8fd 100644
--- a/test/CodeGenCXX/cxx1z-eval-order.cpp
+++ b/test/CodeGenCXX/cxx1z-eval-order.cpp
@@ -45,13 +45,13 @@ void (*get_f())(A);
 void postfix_before_args() {
   // CHECK: call {{.*}}@{{.*}}get_f{{.*}}(
   // CHECK-ITANIUM: call {{.*}}@_ZN1AC1Ev(
-  // CHECK-WINDOWS: call {{.*}}@"\01??0A@@QEAA@XZ"(
+  // CHECK-WINDOWS: call {{.*}}@"\01??0A@@Q{{AE|EAA}}@XZ"(
   // CHECK: call {{.*}}%{{.*}}(
   get_f()(A{});
 
   // CHECK: call {{.*}}@{{.*}}side_effect{{.*}}(
   // CHECK-ITANIUM: call {{.*}}@_ZN1AC1Ev(
-  // CHECK-WINDOWS: call {{.*}}@"\01??0A@@QEAA@XZ"(
+  // CHECK-WINDOWS: call {{.*}}@"\01??0A@@Q{{AE|EAA}}@XZ"(
   // CHECK: call {{.*}}@{{.*}}callee{{.*}}(
   (side_effect(), callee)(A{});
 // CHECK: }
@@ -115,7 +115,7 @@ void *operator new(decltype(sizeof(0)), C);
 void alloc_before_init() {
   struct Q { Q(A) {} };
   // CHECK-ITANIUM: call {{.*}}@_Znw{{.*}}(
-  // CHECK-WINDOWS: call {{.*}}@"\01??2@YAPEAX_K@Z"(
+  // CHECK-WINDOWS: call {{.*}}@"\01??2@YAP{{EAX_K|AXI}}@Z"(
   // CHECK: call {{.*}}@{{.*}}make_a{{.*}}(
   delete new Q(make_a());