diff options
author | Alex Lorenz <arphaman@gmail.com> | 2017-07-18 17:36:42 +0000 |
---|---|---|
committer | Alex Lorenz <arphaman@gmail.com> | 2017-07-18 17:36:42 +0000 |
commit | 8856048c38146fac48a691610b440343e2c1a669 (patch) | |
tree | fbcc6d71f06c3de13a38556ee948c710d72d4d41 /test/Sema | |
parent | 95c5cdeb80aaf0819eba8ddd4421d04be5e271ff (diff) |
Revert r308327
I forgot to test clang-tools-extra which is now failing.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@308328 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/Sema')
-rw-r--r-- | test/Sema/Inputs/pragma-pack1.h | 23 | ||||
-rw-r--r-- | test/Sema/Inputs/pragma-pack2.h | 6 | ||||
-rw-r--r-- | test/Sema/pragma-pack.c | 5 | ||||
-rw-r--r-- | test/Sema/suspicious-pragma-pack.c | 44 |
4 files changed, 0 insertions, 78 deletions
diff --git a/test/Sema/Inputs/pragma-pack1.h b/test/Sema/Inputs/pragma-pack1.h deleted file mode 100644 index 40e7ad18b2..0000000000 --- a/test/Sema/Inputs/pragma-pack1.h +++ /dev/null @@ -1,23 +0,0 @@ - -#ifdef SET_FIRST_HEADER -#pragma pack (16) -#ifndef SET_SECOND_HEADER -// expected-note@-2 2 {{previous '#pragma pack' directive that modifies alignment is here}} -#else -// expected-note@-4 1 {{previous '#pragma pack' directive that modifies alignment is here}} -#endif -// expected-warning@+3 {{non-default #pragma pack value might change the alignment of struct or union members in the included file}} -#endif - -#include "pragma-pack2.h" - -#ifdef SET_SECOND_HEADER -// expected-warning@-3 {{the current #pragma pack aligment value is modified in the included file}} -#endif - -#ifdef PUSH_POP_FIRST_HEADER -// This is fine, we don't change the current value. -#pragma pack (push, 4) - -#pragma pack (pop) -#endif diff --git a/test/Sema/Inputs/pragma-pack2.h b/test/Sema/Inputs/pragma-pack2.h deleted file mode 100644 index 11036133a1..0000000000 --- a/test/Sema/Inputs/pragma-pack2.h +++ /dev/null @@ -1,6 +0,0 @@ - -#ifdef SET_SECOND_HEADER -#pragma pack (8) // expected-note 2 {{previous '#pragma pack' directive that modifies alignment is here}} -#endif - -struct S { int x; }; diff --git a/test/Sema/pragma-pack.c b/test/Sema/pragma-pack.c index 84a946368f..e93ce42148 100644 --- a/test/Sema/pragma-pack.c +++ b/test/Sema/pragma-pack.c @@ -25,8 +25,3 @@ #pragma pack(pop, 16) /* expected-warning {{value of #pragma pack(show) == 16}} */ #pragma pack(show) - -// Warn about unbalanced pushes. -#pragma pack (push,4) // expected-warning {{unterminated '#pragma pack (push, ...)' at end of file}} -#pragma pack (push) // expected-warning {{unterminated '#pragma pack (push, ...)' at end of file}} -#pragma pack () diff --git a/test/Sema/suspicious-pragma-pack.c b/test/Sema/suspicious-pragma-pack.c deleted file mode 100644 index 10c4167102..0000000000 --- a/test/Sema/suspicious-pragma-pack.c +++ /dev/null @@ -1,44 +0,0 @@ -// RUN: %clang_cc1 -triple i686-apple-darwin9 -fsyntax-only -I %S/Inputs -DSAFE -verify %s -// RUN: %clang_cc1 -triple i686-apple-darwin9 -fsyntax-only -I %S/Inputs -DPUSH_HERE -DSAFE -verify %s -// RUN: %clang_cc1 -triple i686-apple-darwin9 -fsyntax-only -I %S/Inputs -DPUSH_HERE -DPUSH_SET_HERE -verify %s -// RUN: %clang_cc1 -triple i686-apple-darwin9 -fsyntax-only -I %S/Inputs -DPUSH_HERE -DRESET_HERE -DSAFE -verify %s -// RUN: %clang_cc1 -triple i686-apple-darwin9 -fsyntax-only -I %S/Inputs -DPUSH_HERE -DSET_FIRST_HEADER -DWARN_MODIFIED_HEADER -verify %s -// RUN: %clang_cc1 -triple i686-apple-darwin9 -fsyntax-only -I %S/Inputs -DPUSH_HERE -DRESET_HERE -DSET_FIRST_HEADER -DWARN_MODIFIED_HEADER -verify %s -// RUN: %clang_cc1 -triple i686-apple-darwin9 -fsyntax-only -I %S/Inputs -DPUSH_HERE -DPUSH_SET_HERE -DSET_FIRST_HEADER -DWARN_MODIFIED_HEADER -verify %s -// RUN: %clang_cc1 -triple i686-apple-darwin9 -fsyntax-only -I %S/Inputs -DPUSH_HERE -DPUSH_SET_HERE -DSET_SECOND_HEADER -DWARN_MODIFIED_HEADER -verify %s -// RUN: %clang_cc1 -triple i686-apple-darwin9 -fsyntax-only -I %S/Inputs -DPUSH_HERE -DPUSH_SET_HERE -DSET_FIRST_HEADER -DSET_SECOND_HEADER -DWARN_MODIFIED_HEADER -verify %s - -// RUN: %clang_cc1 -triple i686-apple-darwin9 -fsyntax-only -I %S/Inputs -DPUSH_POP_FIRST_HEADER -DSAFE -verify %s - - -#ifdef SAFE -// expected-no-diagnostics -#endif - -#ifdef PUSH_HERE -#pragma pack (push) -#endif - -#ifdef PUSH_SET_HERE -#pragma pack (push, 4) // expected-note {{previous '#pragma pack' directive that modifies alignment is here}} -// expected-warning@+8 {{non-default #pragma pack value might change the alignment of struct or union members in the included file}} -#endif - -#ifdef RESET_HERE -#pragma pack (4) -#pragma pack () // no warning after reset as the value is default. -#endif - -#include "pragma-pack1.h" - -#ifdef WARN_MODIFIED_HEADER -// expected-warning@-3 {{the current #pragma pack aligment value is modified in the included file}} -#endif - -#ifdef PUSH_SET_HERE -#pragma pack (pop) -#endif - -#ifdef PUSH_HERE -#pragma pack (pop) -#endif |