diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2012-03-06 18:41:35 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2012-03-06 18:41:35 +0000 |
| commit | 197c68c856d02941add7b8469b0f82d4ea13a93b (patch) | |
| tree | 33604b44cb76b42bc4c10f75f6caec5f81334582 /clang/test/Sema | |
| parent | 520eb3ba8a4eaf91f8d0b4c5a49ab9e01314ecff (diff) | |
| download | bcm5719-llvm-197c68c856d02941add7b8469b0f82d4ea13a93b.tar.gz bcm5719-llvm-197c68c856d02941add7b8469b0f82d4ea13a93b.zip | |
Undo patch for // rdar://10735698
llvm-svn: 152128
Diffstat (limited to 'clang/test/Sema')
| -rw-r--r-- | clang/test/Sema/block-missing-return-type-warning.c | 18 | ||||
| -rw-r--r-- | clang/test/Sema/warn-unused-parameters.c | 6 |
2 files changed, 3 insertions, 21 deletions
diff --git a/clang/test/Sema/block-missing-return-type-warning.c b/clang/test/Sema/block-missing-return-type-warning.c deleted file mode 100644 index c029ae610f3..00000000000 --- a/clang/test/Sema/block-missing-return-type-warning.c +++ /dev/null @@ -1,18 +0,0 @@ -// RUN: %clang_cc1 %s -fsyntax-only -verify -fblocks -Wblock-missing-explicit-return-type -// rdar://10735698 - -int f; -int main() { - int (^bar)() = ^{ if (f) return 'a'; // expected-warning {{block literal is missing explicit return type and returns non-void values}} - else return 10; - }; - - void (^bar1)() = ^{ f = 100; }; - - void (^bar2)() = ^(void){ f = 100; }; - - int (^bar3)() = ^ int { if (f) return 'a'; - else return 10; - }; - -} diff --git a/clang/test/Sema/warn-unused-parameters.c b/clang/test/Sema/warn-unused-parameters.c index 28a6bcb799c..af048e77e88 100644 --- a/clang/test/Sema/warn-unused-parameters.c +++ b/clang/test/Sema/warn-unused-parameters.c @@ -24,7 +24,7 @@ static void achor() {}; // RUN: %clang_cc1 -fblocks -fsyntax-only -Weverything %s 2>&1 | FileCheck -check-prefix=CHECK-everything %s // RUN: %clang_cc1 -fblocks -fsyntax-only -Weverything -Werror %s 2>&1 | FileCheck -check-prefix=CHECK-everything-error %s // RUN: %clang_cc1 -fblocks -fsyntax-only -Weverything -Wno-unused %s 2>&1 | FileCheck -check-prefix=CHECK-everything-no-unused %s -// CHECK-everything: 7 warnings generated -// CHECK-everything-error: 6 errors generated -// CHECK-everything-no-unused: 6 warnings generated +// CHECK-everything: 6 warnings generated +// CHECK-everything-error: 5 errors generated +// CHECK-everything-no-unused: 5 warnings generated |
