Author: Erich Keane Date: 2021-10-20T12:38:36-07:00 New Revision: 35037ae1971a92b07783339ee9d7a5da50a2ab4b
URL: https://github.com/llvm/llvm-project/commit/35037ae1971a92b07783339ee9d7a5da50a2ab4b DIFF: https://github.com/llvm/llvm-project/commit/35037ae1971a92b07783339ee9d7a5da50a2ab4b.diff LOG: Make dr177x.cpp test work with Windows-32 bit platfroms with 'thiscall'. My downstream noticed that the test failed on windows-32 bit machines since the types have __attribute__((thiscall)) on them in a few places. This patch just adds a wildcard to handle that, since it isn't particularly important to the test. Added: Modified: clang/test/CXX/drs/dr177x.cpp Removed: ################################################################################ diff --git a/clang/test/CXX/drs/dr177x.cpp b/clang/test/CXX/drs/dr177x.cpp index 0ac4deac6a8de..d307988ddbb66 100644 --- a/clang/test/CXX/drs/dr177x.cpp +++ b/clang/test/CXX/drs/dr177x.cpp @@ -2,6 +2,7 @@ // RUN: %clang_cc1 -std=c++11 %s -fexceptions -fcxx-exceptions -pedantic-errors -ast-dump | FileCheck %s --check-prefixes=CHECK,CXX11 // RUN: %clang_cc1 -std=c++14 %s -fexceptions -fcxx-exceptions -pedantic-errors -ast-dump | FileCheck %s --check-prefixes=CHECK,CXX11,CXX14 // RUN: %clang_cc1 -std=c++1z %s -fexceptions -fcxx-exceptions -pedantic-errors -ast-dump | FileCheck %s --check-prefixes=CHECK,CXX11,CXX14 +// RUN: %clang_cc1 -std=c++1z %s -fexceptions -fcxx-exceptions -pedantic-errors -triple i386-windows-pc -ast-dump | FileCheck %s --check-prefixes=CHECK,CXX11,CXX14 namespace dr1772 { // dr1772: 14 // __func__ in a lambda should name operator(), not the containing function. @@ -10,7 +11,7 @@ namespace dr1772 { // dr1772: 14 auto x = []() { __func__; }; // CXX11: LambdaExpr // CXX11: CXXRecordDecl - // CXX11: CXXMethodDecl{{.+}} operator() 'void () const' + // CXX11: CXXMethodDecl{{.+}} operator() 'void () {{.*}}const' // CXX11-NEXT: CompoundStmt // CXX11-NEXT: PredefinedExpr{{.+}} 'const char [11]' lvalue __func__ // CXX11-NEXT: StringLiteral{{.+}} 'const char [11]' lvalue "operator()" @@ -21,7 +22,7 @@ namespace dr1772 { // dr1772: 14 // CXX11-NEXT: CompoundStmt // CXX11: LambdaExpr // CXX11: CXXRecordDecl - // CXX11: CXXMethodDecl{{.+}} operator() 'void () const' + // CXX11: CXXMethodDecl{{.+}} operator() 'void () {{.*}}const' // CXX11-NEXT: CompoundStmt // CXX11-NEXT: PredefinedExpr{{.+}} 'const char [11]' lvalue __func__ // CXX11-NEXT: StringLiteral{{.+}} 'const char [11]' lvalue "operator()" @@ -46,7 +47,7 @@ namespace dr1779 { // dr1779: 14 class ClassTemplate { // CHECK: ClassTemplateDecl{{.+}} ClassTemplate void MemFunc() { - // CHECK: CXXMethodDecl{{.+}} MemFunc 'void ()' + // CHECK: CXXMethodDecl{{.+}} MemFunc 'void (){{.*}}' // CHECK-NEXT: CompoundStmt // CHECK-NEXT: PredefinedExpr{{.+}} '<dependent type>' lvalue __func__ __func__; @@ -55,7 +56,7 @@ namespace dr1779 { // dr1779: 14 }; template <typename T> void ClassTemplate<T>::OutOfLineMemFunc() { - // CHECK: CXXMethodDecl{{.+}}parent{{.+}} OutOfLineMemFunc 'void ()' + // CHECK: CXXMethodDecl{{.+}}parent{{.+}} OutOfLineMemFunc 'void (){{.*}}' // CHECK-NEXT: CompoundStmt // CHECK-NEXT: PredefinedExpr{{.+}} '<dependent type>' lvalue __func__ __func__; @@ -66,7 +67,7 @@ namespace dr1779 { // dr1779: 14 // CXX14: FunctionDecl{{.+}}contains_generic_lambda // CXX14: LambdaExpr // CXX14: CXXRecordDecl - // CXX14: CXXMethodDecl{{.+}} operator() 'auto (auto) const' + // CXX14: CXXMethodDecl{{.+}} operator() 'auto (auto) {{.*}}const' // CXX14-NEXT: ParmVarDecl // CXX14-NEXT: CompoundStmt // CXX14-NEXT: PredefinedExpr{{.+}} '<dependent type>' lvalue __func__ _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
