Revert "[FileCheck] Move FileCheck implementation out of LLVMSupport into its own library"

This reverts commit e9a3d1a401. Seems the new
FileCheck library doesn't link on some bots. Reverting for now.

llvm/include/llvm/Support/FileCheck.h

@@ -1,4 +1,4 @@
-//==-- llvm/FileCheck/FileCheck.h --------------------------------*- C++ -*-==//
+//==-- llvm/Support/FileCheck.h ---------------------------*- C++ -*-==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_FILECHECK_FILECHECK_H
-#define LLVM_FILECHECK_FILECHECK_H
+#ifndef LLVM_SUPPORT_FILECHECK_H
+#define LLVM_SUPPORT_FILECHECK_H
 
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/MemoryBuffer.h"

llvm/include/llvm/module.modulemap

@@ -195,13 +195,6 @@ module LLVM_ExecutionEngine {
 
 }
 
-module LLVM_FileCheck {
-  requires cplusplus
-
-  umbrella "FileCheck"
-  module * { export * }
-}
-
 // Orc utilities that don't depend only on Support (not ExecutionEngine or
 // IR). This is a workaround for ExecutionEngine's broken layering, and will
 // be removed in the future.

llvm/lib/CMakeLists.txt

@@ -3,7 +3,6 @@
 
 add_subdirectory(IR)
 add_subdirectory(FuzzMutate)
-add_subdirectory(FileCheck)
 add_subdirectory(InterfaceStub)
 add_subdirectory(IRReader)
 add_subdirectory(CodeGen)

llvm/lib/FileCheck/CMakeLists.txt

@@ -1,6 +0,0 @@
-add_llvm_component_library(LLVMFileCheck
-  FileCheck.cpp
-
-  ADDITIONAL_HEADER_DIRS
-  "${LLVM_MAIN_INCLUDE_DIR}/llvm/FileCheck"
-)

llvm/lib/Support/CMakeLists.txt

@@ -119,6 +119,7 @@ add_llvm_component_library(LLVMSupport
   Error.cpp
   ErrorHandling.cpp
   ExtensibleRTTI.cpp
+  FileCheck.cpp
   FileCollector.cpp
   FileUtilities.cpp
   FileOutputBuffer.cpp

llvm/lib/Support/FileCheck.cpp

@@ -13,7 +13,7 @@
 // as well as various unittests.
 //===----------------------------------------------------------------------===//
 
-#include "llvm/FileCheck/FileCheck.h"
+#include "llvm/Support/FileCheck.h"
 #include "FileCheckImpl.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/StringSet.h"

llvm/lib/Support/FileCheckImpl.h

@@ -12,13 +12,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_LIB_FILECHECK_FILECHECKIMPL_H
-#define LLVM_LIB_FILECHECK_FILECHECKIMPL_H
+#ifndef LLVM_LIB_SUPPORT_FILECHECKIMPL_H
+#define LLVM_LIB_SUPPORT_FILECHECKIMPL_H
 
+#include "llvm/Support/FileCheck.h"
 #include "llvm/ADT/Optional.h"
 #include "llvm/ADT/StringMap.h"
 #include "llvm/ADT/StringRef.h"
-#include "llvm/FileCheck/FileCheck.h"
 #include "llvm/Support/Error.h"
 #include "llvm/Support/SourceMgr.h"
 #include <map>

llvm/unittests/CMakeLists.txt

@@ -24,7 +24,6 @@ add_subdirectory(CodeGen)
 add_subdirectory(DebugInfo)
 add_subdirectory(Demangle)
 add_subdirectory(ExecutionEngine)
-add_subdirectory(FileCheck)
 add_subdirectory(Frontend)
 add_subdirectory(FuzzMutate)
 add_subdirectory(InterfaceStub)

llvm/unittests/CodeGen/GlobalISel/CMakeLists.txt

@@ -2,7 +2,6 @@ set(LLVM_LINK_COMPONENTS
   ${LLVM_TARGETS_TO_BUILD}
   CodeGen
   Core
-  FileCheck
   GlobalISel
   MC
   MIRParser

llvm/unittests/CodeGen/GlobalISel/GISelMITest.h

@@ -21,8 +21,8 @@
 #include "llvm/CodeGen/TargetInstrInfo.h"
 #include "llvm/CodeGen/TargetLowering.h"
 #include "llvm/CodeGen/TargetSubtargetInfo.h"
-#include "llvm/FileCheck/FileCheck.h"
 #include "llvm/InitializePasses.h"
+#include "llvm/Support/FileCheck.h"
 #include "llvm/Support/SourceMgr.h"
 #include "llvm/Support/TargetRegistry.h"
 #include "llvm/Support/TargetSelect.h"

llvm/unittests/FileCheck/CMakeLists.txt

@@ -1,10 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  FileCheck
-  Support
-)
-
-add_llvm_unittest(FileCheckTests
-  FileCheckTest.cpp
-)
-
-target_link_libraries(FileCheckTests PRIVATE LLVMTestingSupport)

llvm/unittests/Support/CMakeLists.txt

@@ -33,6 +33,7 @@ add_llvm_unittest(SupportTests
   ErrorOrTest.cpp
   ErrorTest.cpp
   ExtensibleRTTITest.cpp
+  FileCheckTest.cpp
   FileCollectorTest.cpp
   FileOutputBufferTest.cpp
   FileUtilitiesTest.cpp

llvm/unittests/Support/FileCheckTest.cpp

@@ -1,4 +1,4 @@
-//===- llvm/unittest/FileCheck/FileCheckTest.cpp - FileCheck tests --------===//
+//===- llvm/unittest/Support/FileCheckTest.cpp - FileCheck tests --===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/FileCheck/FileCheck.h"
-#include "../lib/FileCheck/FileCheckImpl.h"
+#include "llvm/Support/FileCheck.h"
+#include "../lib/Support/FileCheckImpl.h"
 #include "llvm/Support/Regex.h"
 #include "llvm/Testing/Support/Error.h"
 #include "gtest/gtest.h"

llvm/utils/FileCheck/CMakeLists.txt

@@ -2,4 +2,4 @@ add_llvm_utility(FileCheck
   FileCheck.cpp
   )
 
-target_link_libraries(FileCheck PRIVATE LLVMFileCheck LLVMSupport)
+target_link_libraries(FileCheck PRIVATE LLVMSupport)

llvm/utils/FileCheck/FileCheck.cpp

@@ -15,12 +15,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/FileCheck/FileCheck.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/InitLLVM.h"
 #include "llvm/Support/Process.h"
 #include "llvm/Support/WithColor.h"
 #include "llvm/Support/raw_ostream.h"
+#include "llvm/Support/FileCheck.h"
 #include <cmath>
 using namespace llvm;
 

llvm/utils/gn/secondary/llvm/lib/FileCheck/BUILD.gn

@@ -1,7 +0,0 @@
-static_library("FileCheck") {
-  output_name = "LLVMFileCheck"
-  deps = [ "//llvm/lib/Support" ]
-  sources = [
-    "FileCheck.cpp",
-  ]
-}

llvm/utils/gn/secondary/llvm/lib/Support/BUILD.gn

@@ -71,6 +71,7 @@ static_library("Support") {
     "Error.cpp",
     "ErrorHandling.cpp",
     "ExtensibleRTTI.cpp",
+    "FileCheck.cpp",
     "FileCollector.cpp",
     "FileOutputBuffer.cpp",
     "FileUtilities.cpp",

llvm/utils/gn/secondary/llvm/unittests/BUILD.gn

@@ -20,7 +20,6 @@ group("unittests") {
     "ExecutionEngine/JITLink:JITLinkTests",
     "ExecutionEngine/MCJIT:MCJITTests",
     "ExecutionEngine/Orc:OrcJITTests",
-    "FileCheck:FileCheckTests",
     "Frontend:LLVMFrontendTests",
     "FuzzMutate:FuzzMutateTests",
     "IR:IRTests",

llvm/utils/gn/secondary/llvm/unittests/CodeGen/GlobalISel/BUILD.gn

@@ -5,7 +5,6 @@ unittest("GlobalISelTests") {
     "//llvm/lib/CodeGen",
     "//llvm/lib/CodeGen/GlobalISel",
     "//llvm/lib/CodeGen/MIRParser",
-    "//llvm/lib/FileCheck",
     "//llvm/lib/IR",
     "//llvm/lib/MC",
     "//llvm/lib/Support",

llvm/utils/gn/secondary/llvm/unittests/FileCheck/BUILD.gn

@@ -1,9 +0,0 @@
-import("//llvm/utils/unittest/unittest.gni")
-
-unittest("FileCheckTests") {
-  deps = [
-    "//llvm/lib/FileCheck",
-    "//llvm/lib/Support",
-  ]
-  sources = [ "FileCheckTest.cpp" ]
-}

llvm/utils/gn/secondary/llvm/unittests/Support/BUILD.gn

@@ -36,6 +36,7 @@ unittest("SupportTests") {
     "ErrorOrTest.cpp",
     "ErrorTest.cpp",
     "ExtensibleRTTITest.cpp",
+    "FileCheckTest.cpp",
     "FileCollectorTest.cpp",
     "FileOutputBufferTest.cpp",
     "FileUtilitiesTest.cpp",