mstorsjo created this revision.
mstorsjo added reviewers: john.brawn, aaron.ballman.
Herald added a project: All.
mstorsjo requested review of this revision.
Herald added a project: clang.
These tests undefine __declspec or __stdcall, both which are
builtin macros in MinGW mode. Therefore, build those cases with
-Wno-builtin-macro-redefined.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D151662
Files:
clang/test/PCH/single-token-macro.c
clang/test/Rewriter/objc-modern-boxing.mm
clang/test/Rewriter/rewrite-byref-in-nested-blocks.mm
clang/test/Rewriter/rewrite-modern-block-consts.mm
clang/test/Rewriter/rewrite-modern-block.mm
clang/test/Rewriter/rewrite-modern-default-property-synthesis.mm
clang/test/Rewriter/rewrite-modern-extern-c-func-decl.mm
clang/test/Rewriter/rewrite-modern-ivar-access.mm
clang/test/Rewriter/rewrite-modern-ivars-1.mm
clang/test/Rewriter/rewrite-modern-private-ivars.mm
clang/test/Rewriter/rewrite-modern-struct-ivar-1.mm
clang/test/Rewriter/rewrite-modern-struct-ivar.mm
clang/test/Rewriter/rewrite-rewritten-initializer.mm
Index: clang/test/Rewriter/rewrite-rewritten-initializer.mm
===================================================================
--- clang/test/Rewriter/rewrite-rewritten-initializer.mm
+++ clang/test/Rewriter/rewrite-rewritten-initializer.mm
@@ -1,7 +1,7 @@
// RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc -fobjc-runtime=macosx-fragile-10.5 %s -o %t-rw.cpp
-// RUN: %clang_cc1 -fsyntax-only -Wno-address-of-temporary -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw.cpp
+// RUN: %clang_cc1 -fsyntax-only -Wno-address-of-temporary -Wno-builtin-macro-redefined -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw.cpp
// RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc %s -o %t-rw-modern.cpp
-// RUN: %clang_cc1 -fsyntax-only -Werror -Wno-address-of-temporary -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw-modern.cpp
+// RUN: %clang_cc1 -fsyntax-only -Werror -Wno-address-of-temporary -Wno-builtin-macro-redefined -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw-modern.cpp
// radar 7669784
typedef unsigned long size_t;
Index: clang/test/Rewriter/rewrite-modern-struct-ivar.mm
===================================================================
--- clang/test/Rewriter/rewrite-modern-struct-ivar.mm
+++ clang/test/Rewriter/rewrite-modern-struct-ivar.mm
@@ -1,7 +1,7 @@
// RUN: %clang_cc1 -E %s -o %t.mm
// RUN: %clang_cc1 -fblocks -rewrite-objc -fms-extensions %t.mm -o %t-rw.cpp
// RUN: FileCheck --input-file=%t-rw.cpp %s
-// RUN: %clang_cc1 -fsyntax-only -Werror -Wno-address-of-temporary -Wno-c++11-narrowing -std=c++11 -D"Class=void*" -D"id=void*" -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw.cpp
+// RUN: %clang_cc1 -fsyntax-only -Werror -Wno-address-of-temporary -Wno-c++11-narrowing -Wno-builtin-macro-redefined -std=c++11 -D"Class=void*" -D"id=void*" -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw.cpp
struct S {
int i1;
Index: clang/test/Rewriter/rewrite-modern-struct-ivar-1.mm
===================================================================
--- clang/test/Rewriter/rewrite-modern-struct-ivar-1.mm
+++ clang/test/Rewriter/rewrite-modern-struct-ivar-1.mm
@@ -1,5 +1,5 @@
// RUN: %clang_cc1 -fblocks -rewrite-objc -fms-extensions %s -o %t-rw.cpp
-// RUN: %clang_cc1 -Werror -fsyntax-only -Wno-address-of-temporary -Wno-c++11-narrowing -std=c++11 -D"Class=void*" -D"id=void*" -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw.cpp
+// RUN: %clang_cc1 -Werror -fsyntax-only -Wno-address-of-temporary -Wno-c++11-narrowing -Wno-builtin-macro-redefined -std=c++11 -D"Class=void*" -D"id=void*" -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw.cpp
// rdar://11323187
typedef unsigned long NSUInteger;
Index: clang/test/Rewriter/rewrite-modern-private-ivars.mm
===================================================================
--- clang/test/Rewriter/rewrite-modern-private-ivars.mm
+++ clang/test/Rewriter/rewrite-modern-private-ivars.mm
@@ -1,5 +1,5 @@
// RUN: %clang_cc1 -fblocks -rewrite-objc -fms-extensions %s -o %t-rw.cpp
-// RUN: %clang_cc1 -Werror -fsyntax-only -Wno-address-of-temporary -Wno-c++11-narrowing -std=c++11 -D"Class=void*" -D"id=void*" -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw.cpp
+// RUN: %clang_cc1 -Werror -fsyntax-only -Wno-address-of-temporary -Wno-c++11-narrowing -Wno-builtin-macro-redefined -std=c++11 -D"Class=void*" -D"id=void*" -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw.cpp
// rdar://11351299
struct Q {
Index: clang/test/Rewriter/rewrite-modern-ivars-1.mm
===================================================================
--- clang/test/Rewriter/rewrite-modern-ivars-1.mm
+++ clang/test/Rewriter/rewrite-modern-ivars-1.mm
@@ -1,5 +1,5 @@
// RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc %s -o %t-rw.cpp
-// RUN: %clang_cc1 -fsyntax-only -Werror -Wno-address-of-temporary -D"Class=void*" -D"id=void*" -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw.cpp
+// RUN: %clang_cc1 -fsyntax-only -Werror -Wno-address-of-temporary -Wno-builtin-macro-redefined -D"Class=void*" -D"id=void*" -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw.cpp
@interface NSCheapMutableString {
@private
Index: clang/test/Rewriter/rewrite-modern-ivar-access.mm
===================================================================
--- clang/test/Rewriter/rewrite-modern-ivar-access.mm
+++ clang/test/Rewriter/rewrite-modern-ivar-access.mm
@@ -1,5 +1,5 @@
// RUN: %clang_cc1 -fblocks -rewrite-objc -fms-extensions %s -o %t-rw.cpp
-// RUN: %clang_cc1 -Werror -fsyntax-only -Wno-address-of-temporary -Wno-c++11-narrowing -std=c++11 -D"Class=void*" -D"id=void*" -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw.cpp
+// RUN: %clang_cc1 -Werror -fsyntax-only -Wno-address-of-temporary -Wno-c++11-narrowing -std=c++11 -D"Class=void*" -D"id=void*" -D"SEL=void*" -Wno-builtin-macro-redefined -U__declspec -D"__declspec(X)=" %t-rw.cpp
struct OUTSIDE {
int i_OUTSIDE;
Index: clang/test/Rewriter/rewrite-modern-extern-c-func-decl.mm
===================================================================
--- clang/test/Rewriter/rewrite-modern-extern-c-func-decl.mm
+++ clang/test/Rewriter/rewrite-modern-extern-c-func-decl.mm
@@ -1,5 +1,5 @@
// RUN: %clang_cc1 -fms-extensions -U__declspec -rewrite-objc -x objective-c++ -fblocks -o %t-rw.cpp %s
-// RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -Werror -Wno-address-of-temporary -Wno-attributes -D"Class=void*" -D"id=void*" -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw.cpp
+// RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -Werror -Wno-address-of-temporary -Wno-attributes -Wno-builtin-macro-redefined -D"Class=void*" -D"id=void*" -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw.cpp
// rdar://11131490
typedef unsigned long size_t;
Index: clang/test/Rewriter/rewrite-modern-default-property-synthesis.mm
===================================================================
--- clang/test/Rewriter/rewrite-modern-default-property-synthesis.mm
+++ clang/test/Rewriter/rewrite-modern-default-property-synthesis.mm
@@ -1,7 +1,7 @@
// RUN: %clang_cc1 -E %s -o %t.mm
// RUN: %clang_cc1 -x objective-c++ -fms-extensions -rewrite-objc %t.mm -o %t-rw.cpp
// RUN: FileCheck --input-file=%t-rw.cpp %s
-// RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -Werror -DSEL="void *" -Did="struct objc_object *" -Wno-attributes -Wno-address-of-temporary -U__declspec -D"__declspec(X)=" %t-rw.cpp
+// RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -Werror -DSEL="void *" -Did="struct objc_object *" -Wno-attributes -Wno-address-of-temporary -Wno-builtin-macro-redefined -U__declspec -D"__declspec(X)=" %t-rw.cpp
// rdar://11374235
extern "C" void *sel_registerName(const char *);
Index: clang/test/Rewriter/rewrite-modern-block.mm
===================================================================
--- clang/test/Rewriter/rewrite-modern-block.mm
+++ clang/test/Rewriter/rewrite-modern-block.mm
@@ -1,5 +1,5 @@
// RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc %s -o %t-rw.cpp
-// RUN: %clang_cc1 -fsyntax-only -Werror -Wno-address-of-temporary -D"Class=void*" -D"id=void*" -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw.cpp
+// RUN: %clang_cc1 -fsyntax-only -Werror -Wno-address-of-temporary -Wno-builtin-macro-redefined -D"Class=void*" -D"id=void*" -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw.cpp
// rdar://11230308
typedef unsigned long size_t;
Index: clang/test/Rewriter/rewrite-modern-block-consts.mm
===================================================================
--- clang/test/Rewriter/rewrite-modern-block-consts.mm
+++ clang/test/Rewriter/rewrite-modern-block-consts.mm
@@ -1,5 +1,5 @@
// RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc %s -o %t-modern-rw.cpp
-// RUN: %clang_cc1 -fsyntax-only -Werror -Wno-address-of-temporary -U__declspec -D"__declspec(X)=" %t-modern-rw.cpp
+// RUN: %clang_cc1 -fsyntax-only -Werror -Wno-address-of-temporary -Wno-builtin-macro-redefined -U__declspec -D"__declspec(X)=" %t-modern-rw.cpp
// rdar:// 8243071
// rdar://11375908
Index: clang/test/Rewriter/rewrite-byref-in-nested-blocks.mm
===================================================================
--- clang/test/Rewriter/rewrite-byref-in-nested-blocks.mm
+++ clang/test/Rewriter/rewrite-byref-in-nested-blocks.mm
@@ -1,7 +1,7 @@
// RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc -fobjc-runtime=macosx-fragile-10.5 %s -o %t-rw.cpp
-// RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -fblocks -Wno-address-of-temporary -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw.cpp
+// RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -fblocks -Wno-address-of-temporary -Wno-builtin-macro-redefined -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw.cpp
// RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc %s -o %t-modern-rw.cpp
-// RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -Werror -Wno-address-of-temporary -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-modern-rw.cpp
+// RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -Werror -Wno-address-of-temporary -Wno-builtin-macro-redefined -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-modern-rw.cpp
// radar 7692350
// rdar://11375908
Index: clang/test/Rewriter/objc-modern-boxing.mm
===================================================================
--- clang/test/Rewriter/objc-modern-boxing.mm
+++ clang/test/Rewriter/objc-modern-boxing.mm
@@ -1,7 +1,7 @@
// RUN: %clang_cc1 -E %s -o %t.mm
// RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc %t.mm -o - | FileCheck %s
// RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc %t.mm -o %t-rw.cpp
-// RUN: %clang_cc1 -fsyntax-only -Werror -Wno-address-of-temporary -D"Class=void*" -D"id=void*" -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw.cpp -Wno-attributes
+// RUN: %clang_cc1 -fsyntax-only -Werror -Wno-address-of-temporary -Wno-builtin-macro-redefined -D"Class=void*" -D"id=void*" -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw.cpp -Wno-attributes
extern char *strdup(const char *str);
extern "C" void *sel_registerName(const char *);
Index: clang/test/PCH/single-token-macro.c
===================================================================
--- clang/test/PCH/single-token-macro.c
+++ clang/test/PCH/single-token-macro.c
@@ -1,11 +1,11 @@
// rdar://10588825
// Test this without pch.
-// RUN: %clang_cc1 %s -include %s -verify -fsyntax-only
+// RUN: %clang_cc1 %s -include %s -verify -fsyntax-only -Wno-builtin-macro-redefined
// Test with pch.
// RUN: %clang_cc1 %s -emit-pch -o %t
-// RUN: %clang_cc1 %s -include-pch %t -verify -fsyntax-only
+// RUN: %clang_cc1 %s -include-pch %t -verify -fsyntax-only -Wno-builtin-macro-redefined
// expected-no-diagnostics
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
