Revert "clang/test/Driver/crash-report.c: This requires rewriter for -frewrite-includes. [PR20321]"

We've decided to make the core rewriter class and PP rewriters mandatory.
They're only a few hundred lines of code in total and not worth supporting as a
distinct build configuration, especially since doing so disables key compiler
features.

This reverts commit r213150.

Revert "clang/test: Introduce the feature "rewriter" for --enable-clang-rewriter."

This reverts commit r213148.

Revert "Move clang/test/Frontend/rewrite-*.c to clang/test/Frontend/Rewriter/"

This reverts commit r213146.

llvm-svn: 213159

45 files changed, 1 insertions, 33 deletions

diff --git a/clang/test/CXX/basic/basic.start/basic.start.main/p2.cpp b/clang/test/CXX/basic/basic.start/basic.start.main/p2.cpp
index b3e171fbdb9..42e87e5431f 100644
--- a/clang/test/CXX/basic/basic.start/basic.start.main/p2.cpp
+++ b/clang/test/CXX/basic/basic.start/basic.start.main/p2.cpp
@@ -10,7 +10,6 @@
 // RUN: cp %s %t
 // RUN: %clang_cc1 -x c++ %s -std=c++11 -fsyntax-only -verify -DTEST9
 // RUN: not %clang_cc1 -x c++ %t -std=c++11 -fixit -DTEST9
-// REQUIRES: rewriter
 // RUN: %clang_cc1 -x c++ %t -std=c++11 -fsyntax-only -DTEST9
 
 // RUN: %clang_cc1 -fsyntax-only -verify %s -DTEST10
diff --git a/clang/test/CXX/temp/temp.spec/cxx1y-variable-template-no-body.cpp b/clang/test/CXX/temp/temp.spec/cxx1y-variable-template-no-body.cpp
index 3b54a8c3a65..7eb5e3744d1 100644
--- a/clang/test/CXX/temp/temp.spec/cxx1y-variable-template-no-body.cpp
+++ b/clang/test/CXX/temp/temp.spec/cxx1y-variable-template-no-body.cpp
@@ -2,7 +2,6 @@
 // RUN: cp %s %t
 // RUN: not %clang_cc1 --std=c++1y -x c++ -fixit %t -DFIXING
 // RUN: %clang_cc1 --std=c++1y -x c++ %t -DFIXING
-// REQUIRES: rewriter
 
 template<typename T> 
 T pi = T(3.1415926535897932385); // expected-note {{template is declared here}}
diff --git a/clang/test/CXX/temp/temp.spec/no-body.cpp b/clang/test/CXX/temp/temp.spec/no-body.cpp
index aa2380d30bf..61d285b27ed 100644
--- a/clang/test/CXX/temp/temp.spec/no-body.cpp
+++ b/clang/test/CXX/temp/temp.spec/no-body.cpp
@@ -2,7 +2,6 @@
 // RUN: cp %s %t
 // RUN: not %clang_cc1 -x c++ -fixit %t -DFIXING
 // RUN: %clang_cc1 -x c++ %t -DFIXING
-// REQUIRES: rewriter
 
 template<typename T> void f(T) { }
 template<typename T> void g(T) { }
diff --git a/clang/test/Coverage/html-print.c b/clang/test/Coverage/html-print.c
index 2bbe0ad4248..a3f29c6f36f 100644
--- a/clang/test/Coverage/html-print.c
+++ b/clang/test/Coverage/html-print.c
@@ -1,6 +1,3 @@
 // RUN: %clang_cc1 -emit-html -o %t %s
 
-// -emit-html requires rewriter.
-// REQUIRES: rewriter
-
 #include "c-language-features.inc"
diff --git a/clang/test/Driver/crash-report.c b/clang/test/Driver/crash-report.c
index caee7285bfe..da1ff950fb9 100644
--- a/clang/test/Driver/crash-report.c
+++ b/clang/test/Driver/crash-report.c
@@ -10,9 +10,6 @@
 // RUN: cat %t/crash-report-*.sh | FileCheck --check-prefix=CHECKSH %s
 // REQUIRES: crash-recovery
 
-// PR20321: diag invokes clang -E with -frewrite-includes.
-// REQUIRES: rewriter
-
 // because of the glob (*.c, *.sh)
 // REQUIRES: shell
 
diff --git a/clang/test/Format/lit.local.cfg b/clang/test/Format/lit.local.cfg
deleted file mode 100644
index 5bbc711c656..00000000000
--- a/clang/test/Format/lit.local.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-if config.root.clang_rewriter == 0:
-    config.unsupported = True
diff --git a/clang/test/Frontend/Rewriter/Inputs/rewrite-includes-bom.h b/clang/test/Frontend/Inputs/rewrite-includes-bom.h
index 7ba011fc2d7..7ba011fc2d7 100644
--- a/clang/test/Frontend/Rewriter/Inputs/rewrite-includes-bom.h
+++ b/clang/test/Frontend/Inputs/rewrite-includes-bom.h
diff --git a/clang/test/Frontend/Rewriter/Inputs/rewrite-includes-messages.h b/clang/test/Frontend/Inputs/rewrite-includes-messages.h
index e5f0eb25147..e5f0eb25147 100644
--- a/clang/test/Frontend/Rewriter/Inputs/rewrite-includes-messages.h
+++ b/clang/test/Frontend/Inputs/rewrite-includes-messages.h
diff --git a/clang/test/Frontend/Rewriter/Inputs/rewrite-includes1.h b/clang/test/Frontend/Inputs/rewrite-includes1.h
index 1b6c80d5f43..1b6c80d5f43 100644
--- a/clang/test/Frontend/Rewriter/Inputs/rewrite-includes1.h
+++ b/clang/test/Frontend/Inputs/rewrite-includes1.h
diff --git a/clang/test/Frontend/Rewriter/Inputs/rewrite-includes2.h b/clang/test/Frontend/Inputs/rewrite-includes2.h
index 1114e51cc13..1114e51cc13 100644
--- a/clang/test/Frontend/Rewriter/Inputs/rewrite-includes2.h
+++ b/clang/test/Frontend/Inputs/rewrite-includes2.h
diff --git a/clang/test/Frontend/Rewriter/Inputs/rewrite-includes3.h b/clang/test/Frontend/Inputs/rewrite-includes3.h
index 3757bc8b341..3757bc8b341 100644
--- a/clang/test/Frontend/Rewriter/Inputs/rewrite-includes3.h
+++ b/clang/test/Frontend/Inputs/rewrite-includes3.h
diff --git a/clang/test/Frontend/Rewriter/Inputs/rewrite-includes4.h b/clang/test/Frontend/Inputs/rewrite-includes4.h
index b4e25d26f62..b4e25d26f62 100644
--- a/clang/test/Frontend/Rewriter/Inputs/rewrite-includes4.h
+++ b/clang/test/Frontend/Inputs/rewrite-includes4.h
diff --git a/clang/test/Frontend/Rewriter/Inputs/rewrite-includes5.h b/clang/test/Frontend/Inputs/rewrite-includes5.h
index 934bf413e50..934bf413e50 100644
--- a/clang/test/Frontend/Rewriter/Inputs/rewrite-includes5.h
+++ b/clang/test/Frontend/Inputs/rewrite-includes5.h
diff --git a/clang/test/Frontend/Rewriter/Inputs/rewrite-includes6.h b/clang/test/Frontend/Inputs/rewrite-includes6.h
index c18e5013aff..c18e5013aff 100644
--- a/clang/test/Frontend/Rewriter/Inputs/rewrite-includes6.h
+++ b/clang/test/Frontend/Inputs/rewrite-includes6.h
diff --git a/clang/test/Frontend/Rewriter/Inputs/rewrite-includes7.h b/clang/test/Frontend/Inputs/rewrite-includes7.h
index da00d4fb97d..da00d4fb97d 100644
--- a/clang/test/Frontend/Rewriter/Inputs/rewrite-includes7.h
+++ b/clang/test/Frontend/Inputs/rewrite-includes7.h
diff --git a/clang/test/Frontend/Rewriter/Inputs/rewrite-includes8.h b/clang/test/Frontend/Inputs/rewrite-includes8.h
index e827ad99cf3..e827ad99cf3 100644
--- a/clang/test/Frontend/Rewriter/Inputs/rewrite-includes8.h
+++ b/clang/test/Frontend/Inputs/rewrite-includes8.h
diff --git a/clang/test/Frontend/Rewriter/lit.local.cfg b/clang/test/Frontend/Rewriter/lit.local.cfg
deleted file mode 100644
index 5bbc711c656..00000000000
--- a/clang/test/Frontend/Rewriter/lit.local.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-if config.root.clang_rewriter == 0:
-    config.unsupported = True
diff --git a/clang/test/Frontend/Rewriter/rewrite-includes-bom.c b/clang/test/Frontend/rewrite-includes-bom.c
index caa431ad9aa..caa431ad9aa 100644
--- a/clang/test/Frontend/Rewriter/rewrite-includes-bom.c
+++ b/clang/test/Frontend/rewrite-includes-bom.c
diff --git a/clang/test/Frontend/Rewriter/rewrite-includes-cli-include.c b/clang/test/Frontend/rewrite-includes-cli-include.c
index ba96039bdd5..ba96039bdd5 100644
--- a/clang/test/Frontend/Rewriter/rewrite-includes-cli-include.c
+++ b/clang/test/Frontend/rewrite-includes-cli-include.c
diff --git a/clang/test/Frontend/Rewriter/rewrite-includes-eof.c b/clang/test/Frontend/rewrite-includes-eof.c
index af7fd89e3df..af7fd89e3df 100644
--- a/clang/test/Frontend/Rewriter/rewrite-includes-eof.c
+++ b/clang/test/Frontend/rewrite-includes-eof.c
diff --git a/clang/test/Frontend/Rewriter/rewrite-includes-header-cmd-line.c b/clang/test/Frontend/rewrite-includes-header-cmd-line.c
index dffaf28fe23..dffaf28fe23 100644
--- a/clang/test/Frontend/Rewriter/rewrite-includes-header-cmd-line.c
+++ b/clang/test/Frontend/rewrite-includes-header-cmd-line.c
diff --git a/clang/test/Frontend/Rewriter/rewrite-includes-invalid-hasinclude.c b/clang/test/Frontend/rewrite-includes-invalid-hasinclude.c
index 334519a4b02..334519a4b02 100644
--- a/clang/test/Frontend/Rewriter/rewrite-includes-invalid-hasinclude.c
+++ b/clang/test/Frontend/rewrite-includes-invalid-hasinclude.c
diff --git a/clang/test/Frontend/Rewriter/rewrite-includes-messages.c b/clang/test/Frontend/rewrite-includes-messages.c
index f93fe72e58d..f93fe72e58d 100644
--- a/clang/test/Frontend/Rewriter/rewrite-includes-messages.c
+++ b/clang/test/Frontend/rewrite-includes-messages.c
diff --git a/clang/test/Frontend/Rewriter/rewrite-includes-missing.c b/clang/test/Frontend/rewrite-includes-missing.c
index 25a59a03217..25a59a03217 100644
--- a/clang/test/Frontend/Rewriter/rewrite-includes-missing.c
+++ b/clang/test/Frontend/rewrite-includes-missing.c
diff --git a/clang/test/Frontend/Rewriter/rewrite-includes-modules.c b/clang/test/Frontend/rewrite-includes-modules.c
index a766972e565..58d7809909d 100644
--- a/clang/test/Frontend/Rewriter/rewrite-includes-modules.c
+++ b/clang/test/Frontend/rewrite-includes-modules.c
@@ -1,5 +1,5 @@
 // RUN: rm -rf %t
-// RUN: %clang_cc1 -fmodules -fmodules-cache-path=%t -x objective-c %s -F %S/../../Modules/Inputs -E -frewrite-includes -o - | FileCheck %s
+// RUN: %clang_cc1 -fmodules -fmodules-cache-path=%t -x objective-c %s -F %S/../Modules/Inputs -E -frewrite-includes -o - | FileCheck %s
 
 int bar();
 #include <Module/Module.h>
diff --git a/clang/test/Frontend/Rewriter/rewrite-includes-warnings.c b/clang/test/Frontend/rewrite-includes-warnings.c
index 1fb98db3014..1fb98db3014 100644
--- a/clang/test/Frontend/Rewriter/rewrite-includes-warnings.c
+++ b/clang/test/Frontend/rewrite-includes-warnings.c
diff --git a/clang/test/Frontend/Rewriter/rewrite-includes.c b/clang/test/Frontend/rewrite-includes.c
index bed87efa1f7..bed87efa1f7 100644
--- a/clang/test/Frontend/Rewriter/rewrite-includes.c
+++ b/clang/test/Frontend/rewrite-includes.c
diff --git a/clang/test/Frontend/Rewriter/rewrite-macros.c b/clang/test/Frontend/rewrite-macros.c
index 759afb096a2..759afb096a2 100644
--- a/clang/test/Frontend/Rewriter/rewrite-macros.c
+++ b/clang/test/Frontend/rewrite-macros.c
diff --git a/clang/test/Misc/emit-html-insert.c b/clang/test/Misc/emit-html-insert.c
index fcd36525c4a..289c28a5c6d 100644
--- a/clang/test/Misc/emit-html-insert.c
+++ b/clang/test/Misc/emit-html-insert.c
@@ -1,5 +1,4 @@
 // RUN: %clang_cc1 %s -emit-html -o - | grep ">&lt; 10; }"
-// REQUIRES: rewriter
 
 int a(int x) { return x
 < 10; }
diff --git a/clang/test/Misc/emit-html.c b/clang/test/Misc/emit-html.c
index f8042f42aed..ec07a60a606 100644
--- a/clang/test/Misc/emit-html.c
+++ b/clang/test/Misc/emit-html.c
@@ -1,5 +1,4 @@
 // RUN: %clang_cc1 %s -emit-html -o -
-// REQUIRES: rewriter
 
 // rdar://6562329
 #line 42 "foo.c"
diff --git a/clang/test/Parser/brackets.c b/clang/test/Parser/brackets.c
index 67ea423aeea..2750d0e42ed 100644
--- a/clang/test/Parser/brackets.c
+++ b/clang/test/Parser/brackets.c
@@ -3,7 +3,6 @@
 // RUN: not %clang_cc1 -fixit %t -x c -DFIXIT
 // RUN: %clang_cc1 -fsyntax-only %t -x c -DFIXIT
 // RUN: not %clang_cc1 -fsyntax-only -fdiagnostics-parseable-fixits %s 2>&1 | FileCheck %s -strict-whitespace
-// REQUIRES: rewriter
 
 void test1() {
   int a[] = {0,1,1,2,3};
diff --git a/clang/test/Parser/brackets.cpp b/clang/test/Parser/brackets.cpp
index 128b514b158..f418c11d3ac 100644
--- a/clang/test/Parser/brackets.cpp
+++ b/clang/test/Parser/brackets.cpp
@@ -3,7 +3,6 @@
 // RUN: not %clang_cc1 -fixit %t -x c++ -DFIXIT
 // RUN: %clang_cc1 -fsyntax-only %t -x c++ -DFIXIT
 // RUN: not %clang_cc1 -fsyntax-only -fdiagnostics-parseable-fixits %s 2>&1 | FileCheck %s -strict-whitespace
-// REQUIRES: rewriter
 
 void test1() {
   int a[] = {0,1,1,2,3};
diff --git a/clang/test/Parser/colon-colon-parentheses.cpp b/clang/test/Parser/colon-colon-parentheses.cpp
index dc9aa7a0c9e..55948fdb005 100644
--- a/clang/test/Parser/colon-colon-parentheses.cpp
+++ b/clang/test/Parser/colon-colon-parentheses.cpp
@@ -2,7 +2,6 @@
 // RUN: cp %s %t
 // RUN: not %clang_cc1 -x c++ -fixit %t
 // RUN: %clang_cc1 -x c++ %t
-// REQUIRES: rewriter
 
 struct S { static int a,b,c;};
 int S::(a);  // expected-error{{unexpected parenthesis after '::'}}
diff --git a/clang/test/Parser/cxx-extra-semi.cpp b/clang/test/Parser/cxx-extra-semi.cpp
index 1bc0a82b2d7..2aa18dfcc0e 100644
--- a/clang/test/Parser/cxx-extra-semi.cpp
+++ b/clang/test/Parser/cxx-extra-semi.cpp
@@ -4,7 +4,6 @@
 // RUN: cp %s %t
 // RUN: %clang_cc1 -x c++ -Wextra-semi -fixit %t
 // RUN: %clang_cc1 -x c++ -Wextra-semi -Werror %t
-// REQUIRES: rewriter
 
 class A {
   void A1();
diff --git a/clang/test/Parser/nested-namespaces-recovery.cpp b/clang/test/Parser/nested-namespaces-recovery.cpp
index f751180c96d..d45938bb3e6 100644
--- a/clang/test/Parser/nested-namespaces-recovery.cpp
+++ b/clang/test/Parser/nested-namespaces-recovery.cpp
@@ -2,7 +2,6 @@
 // RUN: %clang_cc1 -fsyntax-only -verify %s
 // RUN: not %clang_cc1 -x c++ -fixit %t
 // RUN: %clang_cc1 -x c++ %t
-// REQUIRES: rewriter
 
 namespace foo1::foo2::foo3 { // expected-error {{nested namespace definition must define each namespace separately}}
   int foo(int x) { return x; }
diff --git a/clang/test/Preprocessor/ignore-pragmas.c b/clang/test/Preprocessor/ignore-pragmas.c
index 3226d536f84..e2f9ef3dfa3 100644
--- a/clang/test/Preprocessor/ignore-pragmas.c
+++ b/clang/test/Preprocessor/ignore-pragmas.c
@@ -3,7 +3,6 @@
 // RUN: %clang -M -Wall %s -Xclang -verify
 // RUN: %clang -E -frewrite-includes %s -Wall -Xclang -verify
 // RUN: %clang -E -dD -dM %s -Wall -Xclang -verify
-// REQUIRES: rewriter
 // expected-no-diagnostics
 
 #pragma GCC visibility push (default)
diff --git a/clang/test/Sema/format-strings-fixit-ssize_t.c b/clang/test/Sema/format-strings-fixit-ssize_t.c
index 6e8e49bf97e..5208a294a48 100644
--- a/clang/test/Sema/format-strings-fixit-ssize_t.c
+++ b/clang/test/Sema/format-strings-fixit-ssize_t.c
@@ -2,7 +2,6 @@
 // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -pedantic -Wall -fixit %t
 // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fsyntax-only -pedantic -Wall -Werror %t
 // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -E -o - %t | FileCheck %s
-// REQUIRES: rewriter
 
 /* This is a test of the various code modification hints that are
    provided as part of warning or extension diagnostics. All of the
diff --git a/clang/test/Sema/format-strings-fixit.c b/clang/test/Sema/format-strings-fixit.c
index 098c7e05cad..b982eb45e5f 100644
--- a/clang/test/Sema/format-strings-fixit.c
+++ b/clang/test/Sema/format-strings-fixit.c
@@ -2,7 +2,6 @@
 // RUN: %clang_cc1 -pedantic -Wall -fixit %t
 // RUN: %clang_cc1 -fsyntax-only -pedantic -Wall -Werror %t
 // RUN: %clang_cc1 -E -o - %t | FileCheck %s
-// REQUIRES: rewriter
 
 /* This is a test of the various code modification hints that are
    provided as part of warning or extension diagnostics. All of the
diff --git a/clang/test/Sema/format-strings-no-fixit.c b/clang/test/Sema/format-strings-no-fixit.c
index 7371fde735c..701e945f690 100644
--- a/clang/test/Sema/format-strings-no-fixit.c
+++ b/clang/test/Sema/format-strings-no-fixit.c
@@ -1,7 +1,6 @@
 // RUN: cp %s %t
 // RUN: %clang_cc1 -fsyntax-only -fixit %t
 // RUN: %clang_cc1 -E -o - %t | FileCheck %s
-// REQUIRES: rewriter
 
 /* This is a test of the various code modification hints that are
    provided as part of warning or extension diagnostics. Only
diff --git a/clang/test/Sema/warn-documentation-almost-trailing.c b/clang/test/Sema/warn-documentation-almost-trailing.c
index e3dee2977a9..9ff71a3bce3 100644
--- a/clang/test/Sema/warn-documentation-almost-trailing.c
+++ b/clang/test/Sema/warn-documentation-almost-trailing.c
@@ -3,7 +3,6 @@
 // RUN: cp %s %t
 // RUN: %clang_cc1 -fsyntax-only -Wdocumentation -fixit %t
 // RUN: %clang_cc1 -fsyntax-only -Wdocumentation -Werror %t
-// REQUIRES: rewriter
 
 struct a {
   int x; //< comment // expected-warning {{not a Doxygen trailing comment}}
diff --git a/clang/test/Sema/warn-strncat-size.c b/clang/test/Sema/warn-strncat-size.c
index 0b74b21d583..dcc3367e949 100644
--- a/clang/test/Sema/warn-strncat-size.c
+++ b/clang/test/Sema/warn-strncat-size.c
@@ -2,7 +2,6 @@
 // RUN: %clang_cc1 -DUSE_BUILTINS -Wstrncat-size -verify -fsyntax-only %s
 // RUN: %clang_cc1 -fsyntax-only -Wstrncat-size -fixit -x c %s
 // RUN: %clang_cc1 -DUSE_BUILTINS -fsyntax-only -Wstrncat-size -fixit -x c %s
-// REQUIRES: rewriter
 
 typedef __SIZE_TYPE__ size_t;
 size_t strlen (const char *s);
diff --git a/clang/test/SemaCXX/delete.cpp b/clang/test/SemaCXX/delete.cpp
index 6afdaf1d3aa..5824facc507 100644
--- a/clang/test/SemaCXX/delete.cpp
+++ b/clang/test/SemaCXX/delete.cpp
@@ -2,7 +2,6 @@
 // RUN: cp %s %t
 // RUN: %clang_cc1 -fixit -x c++ %t
 // RUN: %clang_cc1 -E -o - %t | FileCheck %s
-// REQUIRES: rewriter
 
 void f(int a[10][20]) {
   // CHECK: delete[] a;
diff --git a/clang/test/SemaObjC/cocoa-api-usage.m b/clang/test/SemaObjC/cocoa-api-usage.m
index 9e287bf825a..bed7ecde060 100644
--- a/clang/test/SemaObjC/cocoa-api-usage.m
+++ b/clang/test/SemaObjC/cocoa-api-usage.m
@@ -3,7 +3,6 @@
 // RUN: cp %s %t.m
 // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-arc %t.m -fixit -Wobjc-cocoa-api
 // RUN: diff %s.fixed %t.m
-// REQUIRES: rewriter
 
 typedef signed char BOOL;
 #define nil ((void*) 0)
diff --git a/clang/test/SemaObjC/cocoa-api-usage.m.fixed b/clang/test/SemaObjC/cocoa-api-usage.m.fixed
index a27e4ee6db1..f472cf1a304 100644
--- a/clang/test/SemaObjC/cocoa-api-usage.m.fixed
+++ b/clang/test/SemaObjC/cocoa-api-usage.m.fixed
@@ -3,7 +3,6 @@
 // RUN: cp %s %t.m
 // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-arc %t.m -fixit -Wobjc-cocoa-api
 // RUN: diff %s.fixed %t.m
-// REQUIRES: rewriter
 
 typedef signed char BOOL;
 #define nil ((void*) 0)
diff --git a/clang/test/lit.cfg b/clang/test/lit.cfg
index bbc5c99cdf2..b5c5628a580 100644
--- a/clang/test/lit.cfg
+++ b/clang/test/lit.cfg
@@ -335,9 +335,6 @@ for pattern in [r"\bFileCheck\b",
 # Set available features we allow tests to conditionalize on.
 #
 # Enabled/disabled features
-if config.clang_rewriter != 0:
-    config.available_features.add("rewriter")
-
 if config.clang_staticanalyzer != 0:
     config.available_features.add("staticanalyzer")