[clang] 6741f0f - Revert "[Driver] Support libc++ in MSVC"

[Petr Hosek via cfe-commits]

Author: Petr Hosek
Date: 2022-08-18T08:22:43Z
New Revision: 6741f0f9124dd28e1a4bade173774fc47fb75912

URL: https://github.com/llvm/llvm-project/commit/6741f0f9124dd28e1a4bade173774fc47fb75912
DIFF: https://github.com/llvm/llvm-project/commit/6741f0f9124dd28e1a4bade173774fc47fb75912.diff

LOG: Revert "[Driver] Support libc++ in MSVC"

This reverts commit a4230319f7af786f4d947f39a870f339b32a6fe7.

This is causing build failures in the 2-stage build.

Added: 
    

Modified: 
    clang/include/clang/Driver/Options.td
    clang/lib/Driver/ToolChains/MSVC.cpp

Removed: 
    clang/test/Driver/Inputs/msvc_libcxx_tree/usr/bin/.keep
    clang/test/Driver/Inputs/msvc_libcxx_tree/usr/include/c++/v1/.keep
    clang/test/Driver/Inputs/msvc_libcxx_tree/usr/include/x86_64-pc-windows-msvc/c++/v1/.keep
    clang/test/Driver/Inputs/msvc_libcxx_tree/usr/lib/.keep
    clang/test/Driver/Inputs/msvc_libcxx_tree/usr/lib/x86_64-pc-windows-msvc/.keep
    clang/test/Driver/msvc-libcxx.cpp


################################################################################
diff  --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td
index 216560cfc86ec..8c9901d086eee 100644
--- a/clang/include/clang/Driver/Options.td
+++ b/clang/include/clang/Driver/Options.td
@@ -4017,12 +4017,12 @@ def noprofilelib : Flag<["-"], "noprofilelib">;
 def noseglinkedit : Flag<["-"], "noseglinkedit">;
 def nostartfiles : Flag<["-"], "nostartfiles">, Group<Link_Group>;
 def nostdinc : Flag<["-"], "nostdinc">, Flags<[CoreOption]>;
-def nostdlibinc : Flag<["-"], "nostdlibinc">, Flags<[CoreOption]>;
-def nostdincxx : Flag<["-"], "nostdinc++">, Flags<[CC1Option, CoreOption]>,
+def nostdlibinc : Flag<["-"], "nostdlibinc">;
+def nostdincxx : Flag<["-"], "nostdinc++">, Flags<[CC1Option]>,
   HelpText<"Disable standard #include directories for the C++ standard library">,
   MarshallingInfoNegativeFlag<HeaderSearchOpts<"UseStandardCXXIncludes">>;
 def nostdlib : Flag<["-"], "nostdlib">, Group<Link_Group>;
-def nostdlibxx : Flag<["-"], "nostdlib++">, Group<Link_Group>;
+def nostdlibxx : Flag<["-"], "nostdlib++">;
 def object : Flag<["-"], "object">;
 def o : JoinedOrSeparate<["-"], "o">, Flags<[NoXarchOption, RenderAsInput,
   CC1Option, CC1AsOption, FC1Option, FlangOption]>,

diff  --git a/clang/lib/Driver/ToolChains/MSVC.cpp b/clang/lib/Driver/ToolChains/MSVC.cpp
index e8d6178fdfa18..14ebe38ee1918 100644
--- a/clang/lib/Driver/ToolChains/MSVC.cpp
+++ b/clang/lib/Driver/ToolChains/MSVC.cpp
@@ -153,11 +153,6 @@ void visualstudio::Linker::ConstructJob(Compilation &C, const JobAction &JA,
   if (!C.getDriver().IsCLMode() && Args.hasArg(options::OPT_L))
     for (const auto &LibPath : Args.getAllArgValues(options::OPT_L))
       CmdArgs.push_back(Args.MakeArgString("-libpath:" + LibPath));
-  // Add library directories for standard library shipped with the toolchain.
-  for (const auto &LibPath : TC.getFilePaths()) {
-    if (TC.getVFS().exists(LibPath))
-      CmdArgs.push_back(Args.MakeArgString("-libpath:" + LibPath));
-  }
 
   CmdArgs.push_back("-nologo");
 
@@ -746,36 +741,7 @@ void MSVCToolChain::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
 
 void MSVCToolChain::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs,
                                                  ArgStringList &CC1Args) const {
-  if (DriverArgs.hasArg(options::OPT_nostdlibinc) ||
-      DriverArgs.hasArg(options::OPT_nostdincxx))
-    return;
-
-  switch (GetCXXStdlibType(DriverArgs)) {
-  case ToolChain::CST_Libcxx: {
-    SmallString<128> P(getDriver().Dir);
-    llvm::sys::path::append(P, "..", "include");
-
-    std::string Version = detectLibcxxVersion(P);
-    if (Version.empty())
-      return;
-
-    // First add the per-target include path if it exists.
-    SmallString<128> TargetDir(P);
-    llvm::sys::path::append(TargetDir, getTripleString(), "c++", Version);
-    if (getVFS().exists(TargetDir))
-      addSystemInclude(DriverArgs, CC1Args, TargetDir);
-
-    // Second add the generic one.
-    SmallString<128> Dir(P);
-    llvm::sys::path::append(Dir, "c++", Version);
-    addSystemInclude(DriverArgs, CC1Args, Dir);
-    break;
-  }
-
-  default:
-    // TODO: Shall we report an error for other C++ standard libraries?
-    break;
-  }
+  // FIXME: There should probably be logic here to find libc++ on Windows.
 }
 
 VersionTuple MSVCToolChain::computeMSVCVersion(const Driver *D,

diff  --git a/clang/test/Driver/Inputs/msvc_libcxx_tree/usr/bin/.keep b/clang/test/Driver/Inputs/msvc_libcxx_tree/usr/bin/.keep
deleted file mode 100644
index e69de29bb2d1d..0000000000000

diff  --git a/clang/test/Driver/Inputs/msvc_libcxx_tree/usr/include/c++/v1/.keep b/clang/test/Driver/Inputs/msvc_libcxx_tree/usr/include/c++/v1/.keep
deleted file mode 100644
index e69de29bb2d1d..0000000000000

diff  --git a/clang/test/Driver/Inputs/msvc_libcxx_tree/usr/include/x86_64-pc-windows-msvc/c++/v1/.keep b/clang/test/Driver/Inputs/msvc_libcxx_tree/usr/include/x86_64-pc-windows-msvc/c++/v1/.keep
deleted file mode 100644
index e69de29bb2d1d..0000000000000

diff  --git a/clang/test/Driver/Inputs/msvc_libcxx_tree/usr/lib/.keep b/clang/test/Driver/Inputs/msvc_libcxx_tree/usr/lib/.keep
deleted file mode 100644
index e69de29bb2d1d..0000000000000

diff  --git a/clang/test/Driver/Inputs/msvc_libcxx_tree/usr/lib/x86_64-pc-windows-msvc/.keep b/clang/test/Driver/Inputs/msvc_libcxx_tree/usr/lib/x86_64-pc-windows-msvc/.keep
deleted file mode 100644
index e69de29bb2d1d..0000000000000

diff  --git a/clang/test/Driver/msvc-libcxx.cpp b/clang/test/Driver/msvc-libcxx.cpp
deleted file mode 100644
index c209ec9aca24c..0000000000000
--- a/clang/test/Driver/msvc-libcxx.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-// RUN: %clangxx -### %s 2>&1 -stdlib=libc++ -fuse-ld=lld \
-// RUN:   --target=x86_64-pc-windows-msvc \
-// RUN:   -ccc-install-dir %S/Inputs/msvc_libcxx_tree/usr/bin \
-// RUN:   | FileCheck %s -check-prefix MSVC-LIBCXX
-// MSVC-LIBCXX: "-internal-isystem" "{{.*[/\\]}}include{{/|\\\\}}x86_64-pc-windows-msvc{{/|\\\\}}c++{{/|\\\\}}v1"
-// MSVC-LIBCXX: "-internal-isystem" "{{.*[/\\]}}include{{/|\\\\}}c++{{/|\\\\}}v1"
-// MSVC-LIBCXX: "-libpath:{{.*}}{{/|\\\\}}..{{/|\\\\}}lib{{/|\\\\}}x86_64-pc-windows-msvc"