diff options
56 files changed, 91 insertions, 153 deletions
diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt index b93a78ec01d..02374e20f43 100644 --- a/clang/CMakeLists.txt +++ b/clang/CMakeLists.txt @@ -391,13 +391,6 @@ else() set(ENABLE_CLANG_ARCMT "0") endif() -option(CLANG_ENABLE_REWRITER "Build rewriter." ON) -if (CLANG_ENABLE_REWRITER) - set(ENABLE_CLANG_REWRITER "1") -else() - set(ENABLE_CLANG_REWRITER "0") -endif() - option(CLANG_ENABLE_STATIC_ANALYZER "Build static analyzer." ON) if (CLANG_ENABLE_STATIC_ANALYZER) set(ENABLE_CLANG_STATIC_ANALYZER "1") @@ -405,23 +398,13 @@ else() set(ENABLE_CLANG_STATIC_ANALYZER "0") endif() -if (NOT CLANG_ENABLE_REWRITER AND CLANG_ENABLE_ARCMT) - message(FATAL_ERROR "Cannot disable rewriter while enabling ARCMT") -endif() - -if (NOT CLANG_ENABLE_REWRITER AND CLANG_ENABLE_STATIC_ANALYZER) - message(FATAL_ERROR "Cannot disable rewriter while enabling static analyzer") -endif() - if (NOT CLANG_ENABLE_STATIC_ANALYZER AND CLANG_ENABLE_ARCMT) message(FATAL_ERROR "Cannot disable static analyzer while enabling ARCMT") endif() if(CLANG_ENABLE_ARCMT) add_definitions(-DCLANG_ENABLE_ARCMT) -endif() -if(CLANG_ENABLE_REWRITER) - add_definitions(-DCLANG_ENABLE_REWRITER) + add_definitions(-DCLANG_ENABLE_OBJC_REWRITER) endif() if(CLANG_ENABLE_STATIC_ANALYZER) add_definitions(-DCLANG_ENABLE_STATIC_ANALYZER) diff --git a/clang/examples/clang-interpreter/Makefile b/clang/examples/clang-interpreter/Makefile index 6494e9affdc..d571337735e 100644 --- a/clang/examples/clang-interpreter/Makefile +++ b/clang/examples/clang-interpreter/Makefile @@ -20,7 +20,7 @@ LINK_COMPONENTS := jit interpreter nativecodegen bitreader bitwriter irreader \ USEDLIBS = clangFrontend.a clangSerialization.a clangDriver.a clangCodeGen.a \ clangParse.a clangSema.a clangStaticAnalyzerFrontend.a \ clangStaticAnalyzerCheckers.a clangStaticAnalyzerCore.a \ - clangAnalysis.a clangRewriteCore.a clangRewriteFrontend.a \ + clangAnalysis.a clangRewrite.a clangRewriteFrontend.a \ clangEdit.a clangAST.a clangLex.a clangBasic.a include $(CLANG_LEVEL)/Makefile diff --git a/clang/lib/ARCMigrate/CMakeLists.txt b/clang/lib/ARCMigrate/CMakeLists.txt index e5ec607d73f..b716a20fe63 100644 --- a/clang/lib/ARCMigrate/CMakeLists.txt +++ b/clang/lib/ARCMigrate/CMakeLists.txt @@ -31,7 +31,7 @@ add_clang_library(clangARCMigrate clangEdit clangFrontend clangLex - clangRewriteCore + clangRewrite clangSema clangSerialization clangStaticAnalyzerCheckers diff --git a/clang/lib/Frontend/CMakeLists.txt b/clang/lib/Frontend/CMakeLists.txt index 3fa7a2cf01b..403cc42927a 100644 --- a/clang/lib/Frontend/CMakeLists.txt +++ b/clang/lib/Frontend/CMakeLists.txt @@ -1,3 +1,5 @@ +add_subdirectory(Rewrite) + set(LLVM_LINK_COMPONENTS Option Support diff --git a/clang/lib/Frontend/Makefile b/clang/lib/Frontend/Makefile index 3c13ad69cc6..8554b7649fa 100644 --- a/clang/lib/Frontend/Makefile +++ b/clang/lib/Frontend/Makefile @@ -8,7 +8,7 @@ ##===----------------------------------------------------------------------===## CLANG_LEVEL := ../.. +DIRS := Rewrite LIBRARYNAME := clangFrontend include $(CLANG_LEVEL)/Makefile - diff --git a/clang/lib/Rewrite/Frontend/CMakeLists.txt b/clang/lib/Frontend/Rewrite/CMakeLists.txt index 85af97d343d..924bf5d5ee2 100644 --- a/clang/lib/Rewrite/Frontend/CMakeLists.txt +++ b/clang/lib/Frontend/Rewrite/CMakeLists.txt @@ -18,5 +18,5 @@ add_clang_library(clangRewriteFrontend clangEdit clangFrontend clangLex - clangRewriteCore + clangRewrite ) diff --git a/clang/lib/Rewrite/Frontend/FixItRewriter.cpp b/clang/lib/Frontend/Rewrite/FixItRewriter.cpp index 8b7af7166c8..8b7af7166c8 100644 --- a/clang/lib/Rewrite/Frontend/FixItRewriter.cpp +++ b/clang/lib/Frontend/Rewrite/FixItRewriter.cpp diff --git a/clang/lib/Rewrite/Frontend/FrontendActions.cpp b/clang/lib/Frontend/Rewrite/FrontendActions.cpp index 4394e993a41..59fef736f16 100644 --- a/clang/lib/Rewrite/Frontend/FrontendActions.cpp +++ b/clang/lib/Frontend/Rewrite/FrontendActions.cpp @@ -146,9 +146,7 @@ bool FixItRecompile::BeginInvocation(CompilerInstance &CI) { return true; } -//===----------------------------------------------------------------------===// -// Preprocessor Actions -//===----------------------------------------------------------------------===// +#ifdef CLANG_ENABLE_OBJC_REWRITER ASTConsumer *RewriteObjCAction::CreateASTConsumer(CompilerInstance &CI, StringRef InFile) { @@ -166,6 +164,12 @@ ASTConsumer *RewriteObjCAction::CreateASTConsumer(CompilerInstance &CI, return nullptr; } +#endif + +//===----------------------------------------------------------------------===// +// Preprocessor Actions +//===----------------------------------------------------------------------===// + void RewriteMacrosAction::ExecuteAction() { CompilerInstance &CI = getCompilerInstance(); raw_ostream *OS = CI.createDefaultOutputFile(true, getCurrentFile()); diff --git a/clang/lib/Rewrite/Frontend/HTMLPrint.cpp b/clang/lib/Frontend/Rewrite/HTMLPrint.cpp index 64da05fdde6..64da05fdde6 100644 --- a/clang/lib/Rewrite/Frontend/HTMLPrint.cpp +++ b/clang/lib/Frontend/Rewrite/HTMLPrint.cpp diff --git a/clang/lib/Rewrite/Frontend/InclusionRewriter.cpp b/clang/lib/Frontend/Rewrite/InclusionRewriter.cpp index aa7017baee2..aa7017baee2 100644 --- a/clang/lib/Rewrite/Frontend/InclusionRewriter.cpp +++ b/clang/lib/Frontend/Rewrite/InclusionRewriter.cpp diff --git a/clang/lib/Rewrite/Frontend/Makefile b/clang/lib/Frontend/Rewrite/Makefile index ac97d4074ec..1d565477053 100644 --- a/clang/lib/Rewrite/Frontend/Makefile +++ b/clang/lib/Frontend/Rewrite/Makefile @@ -16,3 +16,7 @@ LIBRARYNAME := clangRewriteFrontend include $(CLANG_LEVEL)/Makefile +ifeq ($(ENABLE_CLANG_ARCMT),1) + CXX.Flags += -DCLANG_ENABLE_OBJC_REWRITER +endif + diff --git a/clang/lib/Rewrite/Frontend/RewriteMacros.cpp b/clang/lib/Frontend/Rewrite/RewriteMacros.cpp index 0d0a991fa6f..0d0a991fa6f 100644 --- a/clang/lib/Rewrite/Frontend/RewriteMacros.cpp +++ b/clang/lib/Frontend/Rewrite/RewriteMacros.cpp diff --git a/clang/lib/Rewrite/Frontend/RewriteModernObjC.cpp b/clang/lib/Frontend/Rewrite/RewriteModernObjC.cpp index 43de31c516e..3e18a8b415a 100644 --- a/clang/lib/Rewrite/Frontend/RewriteModernObjC.cpp +++ b/clang/lib/Frontend/Rewrite/RewriteModernObjC.cpp @@ -30,6 +30,8 @@ #include "llvm/Support/raw_ostream.h" #include <memory> +#ifdef CLANG_ENABLE_OBJC_REWRITER + using namespace clang; using llvm::utostr; @@ -7754,3 +7756,5 @@ Stmt *RewriteModernObjC::RewriteObjCIvarRefExpr(ObjCIvarRefExpr *IV) { ReplaceStmtWithRange(IV, Replacement, OldRange); return Replacement; } + +#endif diff --git a/clang/lib/Rewrite/Frontend/RewriteObjC.cpp b/clang/lib/Frontend/Rewrite/RewriteObjC.cpp index dfeb11a9aa7..7a721771759 100644 --- a/clang/lib/Rewrite/Frontend/RewriteObjC.cpp +++ b/clang/lib/Frontend/Rewrite/RewriteObjC.cpp @@ -29,6 +29,8 @@ #include "llvm/Support/raw_ostream.h" #include <memory> +#ifdef CLANG_ENABLE_OBJC_REWRITER + using namespace clang; using llvm::utostr; @@ -5946,3 +5948,5 @@ Stmt *RewriteObjCFragileABI::RewriteObjCIvarRefExpr(ObjCIvarRefExpr *IV) { ReplaceStmtWithRange(IV, Replacement, OldRange); return Replacement; } + +#endif diff --git a/clang/lib/Rewrite/Frontend/RewriteTest.cpp b/clang/lib/Frontend/Rewrite/RewriteTest.cpp index 722c5e80b44..722c5e80b44 100644 --- a/clang/lib/Rewrite/Frontend/RewriteTest.cpp +++ b/clang/lib/Frontend/Rewrite/RewriteTest.cpp diff --git a/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp b/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp index 76baec7e694..de864f65356 100644 --- a/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp +++ b/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp @@ -45,20 +45,12 @@ static FrontendAction *CreateFrontendBaseAction(CompilerInstance &CI) { case DumpTokens: return new DumpTokensAction(); case EmitAssembly: return new EmitAssemblyAction(); case EmitBC: return new EmitBCAction(); -#ifdef CLANG_ENABLE_REWRITER case EmitHTML: return new HTMLPrintAction(); -#else - case EmitHTML: Action = "EmitHTML"; break; -#endif case EmitLLVM: return new EmitLLVMAction(); case EmitLLVMOnly: return new EmitLLVMOnlyAction(); case EmitCodeGenOnly: return new EmitCodeGenOnlyAction(); case EmitObj: return new EmitObjAction(); -#ifdef CLANG_ENABLE_REWRITER case FixIt: return new FixItAction(); -#else - case FixIt: Action = "FixIt"; break; -#endif case GenerateModule: return new GenerateModuleAction; case GeneratePCH: return new GeneratePCHAction; case GeneratePTH: return new GeneratePTHAction(); @@ -87,25 +79,17 @@ static FrontendAction *CreateFrontendBaseAction(CompilerInstance &CI) { case PrintDeclContext: return new DeclContextPrintAction(); case PrintPreamble: return new PrintPreambleAction(); case PrintPreprocessedInput: { - if (CI.getPreprocessorOutputOpts().RewriteIncludes) { -#ifdef CLANG_ENABLE_REWRITER + if (CI.getPreprocessorOutputOpts().RewriteIncludes) return new RewriteIncludesAction(); -#else - Action = "RewriteIncludesAction"; - break; -#endif - } return new PrintPreprocessedAction(); } -#ifdef CLANG_ENABLE_REWRITER case RewriteMacros: return new RewriteMacrosAction(); - case RewriteObjC: return new RewriteObjCAction(); case RewriteTest: return new RewriteTestAction(); +#ifdef CLANG_ENABLE_OBJC_REWRITER + case RewriteObjC: return new RewriteObjCAction(); #else - case RewriteMacros: Action = "RewriteMacros"; break; case RewriteObjC: Action = "RewriteObjC"; break; - case RewriteTest: Action = "RewriteTest"; break; #endif #ifdef CLANG_ENABLE_ARCMT case MigrateSource: return new arcmt::MigrateSourceAction(); @@ -121,7 +105,7 @@ static FrontendAction *CreateFrontendBaseAction(CompilerInstance &CI) { } #if !defined(CLANG_ENABLE_ARCMT) || !defined(CLANG_ENABLE_STATIC_ANALYZER) \ - || !defined(CLANG_ENABLE_REWRITER) + || !defined(CLANG_ENABLE_OBJC_REWRITER) CI.getDiagnostics().Report(diag::err_fe_action_not_available) << Action; return 0; #else @@ -137,11 +121,9 @@ static FrontendAction *CreateFrontendAction(CompilerInstance &CI) { const FrontendOptions &FEOpts = CI.getFrontendOpts(); -#ifdef CLANG_ENABLE_REWRITER if (FEOpts.FixAndRecompile) { Act = new FixItRecompile(Act); } -#endif #ifdef CLANG_ENABLE_ARCMT if (CI.getFrontendOpts().ProgramAction != frontend::MigrateSource && diff --git a/clang/lib/FrontendTool/Makefile b/clang/lib/FrontendTool/Makefile index 9ce4b767fe5..dfd28207921 100644 --- a/clang/lib/FrontendTool/Makefile +++ b/clang/lib/FrontendTool/Makefile @@ -15,10 +15,7 @@ include $(CLANG_LEVEL)/../../Makefile.config ifeq ($(ENABLE_CLANG_ARCMT),1) CXX.Flags += -DCLANG_ENABLE_ARCMT -endif - -ifeq ($(ENABLE_CLANG_REWRITER),1) - CXX.Flags += -DCLANG_ENABLE_REWRITER + CXX.Flags += -DCLANG_ENABLE_OBJC_REWRITER endif ifeq ($(ENABLE_CLANG_STATIC_ANALYZER),1) diff --git a/clang/lib/Index/CMakeLists.txt b/clang/lib/Index/CMakeLists.txt index fd9810d699c..1ebb636e8ec 100644 --- a/clang/lib/Index/CMakeLists.txt +++ b/clang/lib/Index/CMakeLists.txt @@ -14,6 +14,6 @@ add_clang_library(clangIndex clangBasic clangFormat clangLex - clangRewriteCore + clangRewrite clangTooling ) diff --git a/clang/lib/Makefile b/clang/lib/Makefile index 66632688d93..acf8089629e 100755 --- a/clang/lib/Makefile +++ b/clang/lib/Makefile @@ -11,14 +11,10 @@ CLANG_LEVEL := .. # ARCMigrate and Rewrite are always needed because of libclang. PARALLEL_DIRS = Headers Basic Lex Parse AST Sema CodeGen Analysis Frontend \ FrontendTool Tooling Driver Format Edit Rewrite Serialization \ - Index + Index ASTMatchers include $(CLANG_LEVEL)/../../Makefile.config -ifeq ($(ENABLE_CLANG_REWRITER),1) -PARALLEL_DIRS += ASTMatchers -endif - ifeq ($(ENABLE_CLANG_STATIC_ANALYZER),1) PARALLEL_DIRS += StaticAnalyzer endif diff --git a/clang/lib/Rewrite/CMakeLists.txt b/clang/lib/Rewrite/CMakeLists.txt index d3d75430233..0c77536012a 100644 --- a/clang/lib/Rewrite/CMakeLists.txt +++ b/clang/lib/Rewrite/CMakeLists.txt @@ -1,2 +1,16 @@ -add_subdirectory(Core) -add_subdirectory(Frontend) +set(LLVM_LINK_COMPONENTS + Support + ) + +add_clang_library(clangRewrite + DeltaTree.cpp + HTMLRewrite.cpp + RewriteRope.cpp + Rewriter.cpp + TokenRewriter.cpp + + LINK_LIBS + clangAST + clangBasic + clangLex + ) diff --git a/clang/lib/Rewrite/Core/CMakeLists.txt b/clang/lib/Rewrite/Core/CMakeLists.txt deleted file mode 100644 index 896382c36db..00000000000 --- a/clang/lib/Rewrite/Core/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -set(LLVM_LINK_COMPONENTS - Support - ) - -add_clang_library(clangRewriteCore - DeltaTree.cpp - HTMLRewrite.cpp - RewriteRope.cpp - Rewriter.cpp - TokenRewriter.cpp - - LINK_LIBS - clangAST - clangBasic - clangLex - ) diff --git a/clang/lib/Rewrite/Core/Makefile b/clang/lib/Rewrite/Core/Makefile deleted file mode 100644 index 8c8d2e47813..00000000000 --- a/clang/lib/Rewrite/Core/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -##===- clang/lib/Rewrite/Makefile --------------------------*- Makefile -*-===## -# -# The LLVM Compiler Infrastructure -# -# This file is distributed under the University of Illinois Open Source -# License. See LICENSE.TXT for details. -# -##===----------------------------------------------------------------------===## -# -# This implements code transformation / rewriting facilities. -# -##===----------------------------------------------------------------------===## - -CLANG_LEVEL := ../../.. -LIBRARYNAME := clangRewriteCore - -include $(CLANG_LEVEL)/Makefile - diff --git a/clang/lib/Rewrite/Core/DeltaTree.cpp b/clang/lib/Rewrite/DeltaTree.cpp index 352fab077a2..352fab077a2 100644 --- a/clang/lib/Rewrite/Core/DeltaTree.cpp +++ b/clang/lib/Rewrite/DeltaTree.cpp diff --git a/clang/lib/Rewrite/Core/HTMLRewrite.cpp b/clang/lib/Rewrite/HTMLRewrite.cpp index 275fbd0ebca..275fbd0ebca 100644 --- a/clang/lib/Rewrite/Core/HTMLRewrite.cpp +++ b/clang/lib/Rewrite/HTMLRewrite.cpp diff --git a/clang/lib/Rewrite/Makefile b/clang/lib/Rewrite/Makefile index 0be84d40640..5fef9b2c0d3 100644 --- a/clang/lib/Rewrite/Makefile +++ b/clang/lib/Rewrite/Makefile @@ -1,4 +1,4 @@ -##===- clang/lib/StaticAnalyzer/Makefile -------------------*- Makefile -*-===## +##===- clang/lib/Rewrite/Makefile --------------------------*- Makefile -*-===## # # The LLVM Compiler Infrastructure # @@ -6,9 +6,13 @@ # License. See LICENSE.TXT for details. # ##===----------------------------------------------------------------------===## +# +# This implements code transformation / rewriting facilities. +# +##===----------------------------------------------------------------------===## CLANG_LEVEL := ../.. -DIRS := Frontend -PARALLEL_DIRS := Core +LIBRARYNAME := clangRewrite include $(CLANG_LEVEL)/Makefile + diff --git a/clang/lib/Rewrite/Core/RewriteRope.cpp b/clang/lib/Rewrite/RewriteRope.cpp index ef8abfcadc0..ef8abfcadc0 100644 --- a/clang/lib/Rewrite/Core/RewriteRope.cpp +++ b/clang/lib/Rewrite/RewriteRope.cpp diff --git a/clang/lib/Rewrite/Core/Rewriter.cpp b/clang/lib/Rewrite/Rewriter.cpp index eab4ccfeadc..eab4ccfeadc 100644 --- a/clang/lib/Rewrite/Core/Rewriter.cpp +++ b/clang/lib/Rewrite/Rewriter.cpp diff --git a/clang/lib/Rewrite/Core/TokenRewriter.cpp b/clang/lib/Rewrite/TokenRewriter.cpp index 494defdedaa..494defdedaa 100644 --- a/clang/lib/Rewrite/Core/TokenRewriter.cpp +++ b/clang/lib/Rewrite/TokenRewriter.cpp diff --git a/clang/lib/StaticAnalyzer/Core/CMakeLists.txt b/clang/lib/StaticAnalyzer/Core/CMakeLists.txt index 3a00131ce12..59a6b6fbc59 100644 --- a/clang/lib/StaticAnalyzer/Core/CMakeLists.txt +++ b/clang/lib/StaticAnalyzer/Core/CMakeLists.txt @@ -45,5 +45,5 @@ add_clang_library(clangStaticAnalyzerCore clangAnalysis clangBasic clangLex - clangRewriteCore + clangRewrite ) diff --git a/clang/lib/Tooling/CMakeLists.txt b/clang/lib/Tooling/CMakeLists.txt index a1bf964faf3..2bf9652fa37 100644 --- a/clang/lib/Tooling/CMakeLists.txt +++ b/clang/lib/Tooling/CMakeLists.txt @@ -17,5 +17,5 @@ add_clang_library(clangTooling clangDriver clangFrontend clangLex - clangRewriteCore + clangRewrite ) diff --git a/clang/test/CMakeLists.txt b/clang/test/CMakeLists.txt index b7d689c778f..591a9272ae6 100644 --- a/clang/test/CMakeLists.txt +++ b/clang/test/CMakeLists.txt @@ -26,17 +26,11 @@ endif () list(APPEND CLANG_TEST_DEPS clang clang-headers + clang-check clang-format c-index-test diagtool clang-tblgen ) -if (CLANG_ENABLE_REWRITER) - list(APPEND CLANG_TEST_DEPS - clang-check - clang-format - ) -endif () - if (CLANG_ENABLE_ARCMT) list(APPEND CLANG_TEST_DEPS arcmt-test diff --git a/clang/test/FixIt/lit.local.cfg b/clang/test/FixIt/lit.local.cfg deleted file mode 100644 index 5bbc711c656..00000000000 --- a/clang/test/FixIt/lit.local.cfg +++ /dev/null @@ -1,2 +0,0 @@ -if config.root.clang_rewriter == 0: - config.unsupported = True diff --git a/clang/test/Makefile b/clang/test/Makefile index da7b9654180..bd0bd2e9656 100644 --- a/clang/test/Makefile +++ b/clang/test/Makefile @@ -47,7 +47,6 @@ lit.site.cfg: FORCE @$(ECHOPATH) s=@CLANG_TOOLS_DIR@=$(ToolDir)=g >> lit.tmp @$(ECHOPATH) s=@TARGET_TRIPLE@=$(TARGET_TRIPLE)=g >> lit.tmp @$(ECHOPATH) s=@ENABLE_CLANG_ARCMT@=$(ENABLE_CLANG_ARCMT)=g >> lit.tmp - @$(ECHOPATH) s=@ENABLE_CLANG_REWRITER@=$(ENABLE_CLANG_REWRITER)=g >> lit.tmp @$(ECHOPATH) s=@ENABLE_CLANG_STATIC_ANALYZER@=$(ENABLE_CLANG_STATIC_ANALYZER)=g >> lit.tmp @$(ECHOPATH) s=@ENABLE_CLANG_EXAMPLES@=$(ENABLE_CLANG_EXAMPLES)=g >> lit.tmp @$(ECHOPATH) s=@ENABLE_SHARED@=$(ENABLE_SHARED)=g >> lit.tmp diff --git a/clang/test/Rewriter/lit.local.cfg b/clang/test/Rewriter/lit.local.cfg index 5bbc711c656..69b733b2e4a 100644 --- a/clang/test/Rewriter/lit.local.cfg +++ b/clang/test/Rewriter/lit.local.cfg @@ -1,2 +1,3 @@ -if config.root.clang_rewriter == 0: +# The Objective-C rewriters are currently grouped with ARCMT. +if config.root.clang_arcmt == 0: config.unsupported = True diff --git a/clang/test/lit.site.cfg.in b/clang/test/lit.site.cfg.in index 2a28c006c04..1f0b9600d67 100644 --- a/clang/test/lit.site.cfg.in +++ b/clang/test/lit.site.cfg.in @@ -16,7 +16,6 @@ config.target_triple = "@TARGET_TRIPLE@" config.llvm_use_sanitizer = "@LLVM_USE_SANITIZER@" config.clang_arcmt = @ENABLE_CLANG_ARCMT@ config.clang_staticanalyzer = @ENABLE_CLANG_STATIC_ANALYZER@ -config.clang_rewriter = @ENABLE_CLANG_REWRITER@ config.clang_examples = @ENABLE_CLANG_EXAMPLES@ config.enable_shared = @ENABLE_SHARED@ config.host_arch = "@HOST_ARCH@" diff --git a/clang/tools/CMakeLists.txt b/clang/tools/CMakeLists.txt index d3f67a89602..90b2225a1d2 100644 --- a/clang/tools/CMakeLists.txt +++ b/clang/tools/CMakeLists.txt @@ -1,9 +1,7 @@ add_subdirectory(diagtool) add_subdirectory(driver) -if(CLANG_ENABLE_REWRITER) - add_subdirectory(clang-format) - add_subdirectory(clang-format-vs) -endif() +add_subdirectory(clang-format) +add_subdirectory(clang-format-vs) add_subdirectory(c-index-test) add_subdirectory(libclang) @@ -12,6 +10,7 @@ if(CLANG_ENABLE_ARCMT) add_subdirectory(arcmt-test) add_subdirectory(c-arcmt-test) endif() + if(CLANG_ENABLE_STATIC_ANALYZER) add_subdirectory(clang-check) endif() diff --git a/clang/tools/Makefile b/clang/tools/Makefile index 94032d20b03..2ee12992f23 100644 --- a/clang/tools/Makefile +++ b/clang/tools/Makefile @@ -12,11 +12,7 @@ CLANG_LEVEL := .. include $(CLANG_LEVEL)/../../Makefile.config DIRS := -PARALLEL_DIRS := driver diagtool - -ifeq ($(ENABLE_CLANG_REWRITER),1) - PARALLEL_DIRS += clang-format -endif +PARALLEL_DIRS := clang-format driver diagtool ifeq ($(ENABLE_CLANG_STATIC_ANALYZER), 1) PARALLEL_DIRS += clang-check diff --git a/clang/tools/arcmt-test/Makefile b/clang/tools/arcmt-test/Makefile index 4b9b8db0a0b..d9d44bb05bd 100644 --- a/clang/tools/arcmt-test/Makefile +++ b/clang/tools/arcmt-test/Makefile @@ -18,7 +18,7 @@ NO_INSTALL = 1 include $(CLANG_LEVEL)/../../Makefile.config LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option -USEDLIBS = clangARCMigrate.a clangRewriteCore.a \ +USEDLIBS = clangARCMigrate.a clangRewrite.a \ clangFrontend.a clangDriver.a clangSerialization.a clangParse.a \ clangSema.a clangEdit.a clangAnalysis.a clangAST.a clangLex.a \ clangBasic.a diff --git a/clang/tools/c-arcmt-test/Makefile b/clang/tools/c-arcmt-test/Makefile index 0be3bc136eb..e7d5be7658b 100644 --- a/clang/tools/c-arcmt-test/Makefile +++ b/clang/tools/c-arcmt-test/Makefile @@ -31,7 +31,7 @@ USEDLIBS = clang.a \ clangFormat.a \ clangTooling.a \ clangRewriteFrontend.a \ - clangRewriteCore.a \ + clangRewrite.a \ clangFrontend.a clangDriver.a \ clangStaticAnalyzerCheckers.a clangStaticAnalyzerCore.a \ clangSerialization.a clangParse.a clangSema.a \ diff --git a/clang/tools/c-index-test/Makefile b/clang/tools/c-index-test/Makefile index b38d654a3ac..42bfbb05839 100644 --- a/clang/tools/c-index-test/Makefile +++ b/clang/tools/c-index-test/Makefile @@ -27,7 +27,7 @@ LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option # Note that 'USEDLIBS' must include all of the core clang libraries # when -static is given to linker on cygming. USEDLIBS = clang.a \ - clangIndex.a clangFormat.a clangRewriteCore.a \ + clangIndex.a clangFormat.a clangRewrite.a \ clangFrontend.a clangDriver.a \ clangTooling.a \ clangSerialization.a clangParse.a clangSema.a \ diff --git a/clang/tools/clang-check/Makefile b/clang/tools/clang-check/Makefile index cf088d26893..e98a131de5a 100644 --- a/clang/tools/clang-check/Makefile +++ b/clang/tools/clang-check/Makefile @@ -20,6 +20,6 @@ USEDLIBS = clangFrontend.a clangSerialization.a clangDriver.a \ clangTooling.a clangParse.a clangSema.a \ clangStaticAnalyzerFrontend.a clangStaticAnalyzerCheckers.a \ clangStaticAnalyzerCore.a clangAnalysis.a clangRewriteFrontend.a \ - clangRewriteCore.a clangEdit.a clangAST.a clangLex.a clangBasic.a + clangRewrite.a clangEdit.a clangAST.a clangLex.a clangBasic.a include $(CLANG_LEVEL)/Makefile diff --git a/clang/tools/clang-format/CMakeLists.txt b/clang/tools/clang-format/CMakeLists.txt index b029f712190..f80a3ec9c91 100644 --- a/clang/tools/clang-format/CMakeLists.txt +++ b/clang/tools/clang-format/CMakeLists.txt @@ -8,7 +8,7 @@ target_link_libraries(clang-format clangBasic clangFormat clangLex - clangRewriteCore + clangRewrite clangTooling ) diff --git a/clang/tools/clang-format/Makefile b/clang/tools/clang-format/Makefile index 4902244f865..a26ef59822b 100644 --- a/clang/tools/clang-format/Makefile +++ b/clang/tools/clang-format/Makefile @@ -18,7 +18,7 @@ include $(CLANG_LEVEL)/../../Makefile.config LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option USEDLIBS = clangFormat.a clangTooling.a clangFrontend.a clangSerialization.a \ clangDriver.a clangParse.a clangSema.a clangAnalysis.a \ - clangRewriteFrontend.a clangRewriteCore.a clangEdit.a clangAST.a \ + clangRewriteFrontend.a clangRewrite.a clangEdit.a clangAST.a \ clangLex.a clangBasic.a include $(CLANG_LEVEL)/Makefile diff --git a/clang/tools/driver/Makefile b/clang/tools/driver/Makefile index 7404496875f..347702eb961 100644 --- a/clang/tools/driver/Makefile +++ b/clang/tools/driver/Makefile @@ -35,7 +35,8 @@ LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader bitwriter codegen \ instrumentation ipo irreader linker objcarcopts option \ profiledata selectiondag USEDLIBS = clangFrontendTool.a clangFrontend.a clangDriver.a \ - clangSerialization.a clangCodeGen.a clangParse.a clangSema.a + clangSerialization.a clangCodeGen.a clangParse.a clangSema.a \ + clangRewriteFrontend.a clangRewrite.a ifeq ($(ENABLE_CLANG_STATIC_ANALYZER),1) USEDLIBS += clangStaticAnalyzerFrontend.a clangStaticAnalyzerCheckers.a \ @@ -46,10 +47,6 @@ ifeq ($(ENABLE_CLANG_ARCMT),1) USEDLIBS += clangARCMigrate.a endif -ifeq ($(ENABLE_CLANG_REWRITER),1) -USEDLIBS += clangRewriteFrontend.a clangRewriteCore.a -endif - USEDLIBS += clangAnalysis.a clangEdit.a clangAST.a clangLex.a clangBasic.a include $(CLANG_LEVEL)/Makefile diff --git a/clang/tools/libclang/Makefile b/clang/tools/libclang/Makefile index c03f38b83ac..db3d4f86244 100644 --- a/clang/tools/libclang/Makefile +++ b/clang/tools/libclang/Makefile @@ -25,7 +25,7 @@ USEDLIBS = clangIndex.a clangARCMigrate.a \ clangSerialization.a \ clangParse.a clangSema.a \ clangStaticAnalyzerCheckers.a clangStaticAnalyzerCore.a \ - clangRewriteCore.a \ + clangRewrite.a \ clangAnalysis.a clangEdit.a \ clangASTMatchers.a \ clangAST.a clangLex.a clangBasic.a \ diff --git a/clang/unittests/AST/Makefile b/clang/unittests/AST/Makefile index 0282d21fcf1..e3b3d7dc33e 100644 --- a/clang/unittests/AST/Makefile +++ b/clang/unittests/AST/Makefile @@ -12,7 +12,7 @@ TESTNAME = AST include $(CLANG_LEVEL)/../../Makefile.config LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \ - clangRewriteCore.a clangRewriteFrontend.a \ + clangRewrite.a clangRewriteFrontend.a \ clangParse.a clangSema.a clangAnalysis.a \ clangEdit.a clangAST.a clangASTMatchers.a clangLex.a clangBasic.a diff --git a/clang/unittests/ASTMatchers/Dynamic/Makefile b/clang/unittests/ASTMatchers/Dynamic/Makefile index 66b183c0e48..dfd0086c883 100644 --- a/clang/unittests/ASTMatchers/Dynamic/Makefile +++ b/clang/unittests/ASTMatchers/Dynamic/Makefile @@ -13,7 +13,7 @@ TESTNAME = DynamicASTMatchers include $(CLANG_LEVEL)/../../Makefile.config LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \ - clangRewriteCore.a clangRewriteFrontend.a clangParse.a clangSema.a \ + clangRewrite.a clangRewriteFrontend.a clangParse.a clangSema.a \ clangAnalysis.a clangEdit.a clangAST.a clangASTMatchers.a \ clangLex.a clangBasic.a clangDynamicASTMatchers.a diff --git a/clang/unittests/ASTMatchers/Makefile b/clang/unittests/ASTMatchers/Makefile index dad300c04d3..92f2fa0e5d1 100644 --- a/clang/unittests/ASTMatchers/Makefile +++ b/clang/unittests/ASTMatchers/Makefile @@ -15,7 +15,7 @@ TESTNAME = ASTMatchers include $(CLANG_LEVEL)/../../Makefile.config LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \ - clangRewriteCore.a clangRewriteFrontend.a \ + clangRewrite.a clangRewriteFrontend.a \ clangParse.a clangSema.a clangAnalysis.a \ clangEdit.a clangAST.a clangASTMatchers.a clangLex.a clangBasic.a diff --git a/clang/unittests/CMakeLists.txt b/clang/unittests/CMakeLists.txt index cc1322699e5..936b8b20659 100644 --- a/clang/unittests/CMakeLists.txt +++ b/clang/unittests/CMakeLists.txt @@ -15,13 +15,12 @@ add_subdirectory(Driver) if(CLANG_ENABLE_STATIC_ANALYZER) add_subdirectory(Frontend) endif() -if(CLANG_ENABLE_REWRITER) - add_subdirectory(ASTMatchers) - add_subdirectory(AST) - add_subdirectory(Tooling) - add_subdirectory(Format) - add_subdirectory(Sema) -endif() -if(NOT WIN32) # FIXME:Investigating. +add_subdirectory(ASTMatchers) +add_subdirectory(AST) +add_subdirectory(Tooling) +add_subdirectory(Format) +add_subdirectory(Sema) +# FIXME: Why are the libclang unit tests disabled on Windows? +if(NOT WIN32) add_subdirectory(libclang) endif() diff --git a/clang/unittests/Format/Makefile b/clang/unittests/Format/Makefile index 7de127caafa..e6dce4d8e81 100644 --- a/clang/unittests/Format/Makefile +++ b/clang/unittests/Format/Makefile @@ -12,7 +12,7 @@ TESTNAME = Format include $(CLANG_LEVEL)/../../Makefile.config LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option USEDLIBS = clangFormat.a clangTooling.a clangFrontend.a clangSerialization.a \ - clangDriver.a clangParse.a clangRewriteCore.a \ + clangDriver.a clangParse.a clangRewrite.a \ clangRewriteFrontend.a clangSema.a clangAnalysis.a clangEdit.a \ clangAST.a clangASTMatchers.a clangLex.a clangBasic.a diff --git a/clang/unittests/Frontend/Makefile b/clang/unittests/Frontend/Makefile index 7de9fb4778b..a63ae182453 100644 --- a/clang/unittests/Frontend/Makefile +++ b/clang/unittests/Frontend/Makefile @@ -14,7 +14,7 @@ LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option USEDLIBS = clangFrontendTool.a clangFrontend.a clangDriver.a \ clangSerialization.a clangCodeGen.a clangParse.a clangSema.a \ clangStaticAnalyzerCheckers.a clangStaticAnalyzerCore.a \ - clangARCMigrate.a clangRewriteCore.a \ + clangARCMigrate.a clangRewrite.a \ clangRewriteFrontend.a clangEdit.a \ clangAnalysis.a clangAST.a clangLex.a clangBasic.a diff --git a/clang/unittests/Makefile b/clang/unittests/Makefile index 9b95a6eda20..95b1639415b 100644 --- a/clang/unittests/Makefile +++ b/clang/unittests/Makefile @@ -14,14 +14,10 @@ ifndef CLANG_LEVEL IS_UNITTEST_LEVEL := 1 CLANG_LEVEL := .. -PARALLEL_DIRS = Basic Lex Driver libclang +PARALLEL_DIRS = Basic Lex Driver libclang Format ASTMatchers AST Tooling Sema include $(CLANG_LEVEL)/../..//Makefile.config -ifeq ($(ENABLE_CLANG_REWRITER),1) -PARALLEL_DIRS += Format ASTMatchers AST Tooling Sema -endif - ifeq ($(ENABLE_CLANG_ARCMT),1) PARALLEL_DIRS += Frontend endif diff --git a/clang/unittests/Sema/Makefile b/clang/unittests/Sema/Makefile index cd1d93df5b3..7fd5c27ad60 100644 --- a/clang/unittests/Sema/Makefile +++ b/clang/unittests/Sema/Makefile @@ -12,7 +12,7 @@ TESTNAME = Sema include $(CLANG_LEVEL)/../../Makefile.config LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \ - clangRewriteCore.a clangRewriteFrontend.a \ + clangRewrite.a clangRewriteFrontend.a \ clangParse.a clangSema.a clangAnalysis.a \ clangEdit.a clangAST.a clangASTMatchers.a clangLex.a clangBasic.a diff --git a/clang/unittests/Tooling/CMakeLists.txt b/clang/unittests/Tooling/CMakeLists.txt index c59ff87b59d..a41d87c6ea8 100644 --- a/clang/unittests/Tooling/CMakeLists.txt +++ b/clang/unittests/Tooling/CMakeLists.txt @@ -19,6 +19,6 @@ target_link_libraries(ToolingTests clangBasic clangFrontend clangLex - clangRewriteCore + clangRewrite clangTooling ) diff --git a/clang/unittests/Tooling/Makefile b/clang/unittests/Tooling/Makefile index 9d36f1fa3b4..46af8a11bba 100644 --- a/clang/unittests/Tooling/Makefile +++ b/clang/unittests/Tooling/Makefile @@ -12,7 +12,7 @@ TESTNAME = Tooling include $(CLANG_LEVEL)/../../Makefile.config LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \ - clangParse.a clangRewriteCore.a clangRewriteFrontend.a \ + clangParse.a clangRewrite.a clangRewriteFrontend.a \ clangSema.a clangAnalysis.a clangEdit.a \ clangAST.a clangASTMatchers.a clangLex.a clangBasic.a diff --git a/clang/unittests/libclang/Makefile b/clang/unittests/libclang/Makefile index 7b14c82e098..a6590eb97ae 100644 --- a/clang/unittests/libclang/Makefile +++ b/clang/unittests/libclang/Makefile @@ -17,7 +17,7 @@ LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option # Note that 'USEDLIBS' must include all of the core clang libraries # when -static is given to linker on cygming. USEDLIBS = clang.a \ - clangIndex.a clangFormat.a clangRewriteCore.a \ + clangIndex.a clangFormat.a clangRewrite.a \ clangFrontend.a clangDriver.a \ clangTooling.a \ clangSerialization.a clangParse.a clangSema.a \ |
