Merge pull request #35560 from nkcsgexi/73512368

[5.4] Revert "driver: forward driver invocation to the new driver by default"

Author: nkcsgexi

include/swift/AST/DiagnosticsDriver.def

@@ -193,5 +193,8 @@ WARNING(warn_drv_darwin_sdk_invalid_settings, none,
 REMARK(remark_forwarding_to_new_driver, none,
        "new Swift driver at '%0' will be used", (StringRef))
 
+REMARK(remark_forwarding_driver_not_there, none,
+      "new Swift driver at '%0' cannot be found; C++ driver will be used", (StringRef))
+
 #define UNDEFINE_DIAGNOSTIC_MACROS
 #include "DefineDiagnosticMacros.h"

test/Driver/tools_directory.swift

@@ -6,18 +6,18 @@
 // RUN: %swiftc_driver -### -target x86_64-linux-unknown -tools-directory /Something/obviously/fake %s 2>&1 | %FileCheck -check-prefix BINUTILS %s
 
 // CLANGSUB: swift
-// CLANGSUB: -o [[OBJECTFILE:.*]]
+// CLANGSUB-SAME: -o [[OBJECTFILE:.*]]
 // CLANGSUB: swift-autolink-extract{{(\.exe)?"?}} [[OBJECTFILE]]
-// CLANGSUB: -o {{"?}}[[AUTOLINKFILE:.*]]
+// CLANGSUB-SAME: -o {{"?}}[[AUTOLINKFILE:.*]]
 // CLANGSUB: {{[^ ]+(\\\\|/)}}Inputs{{/|\\\\}}fake-toolchain{{/|\\\\}}clang
 // CLANGSUB-DAG: [[OBJECTFILE]]
 // CLANGSUB-DAG: @[[AUTOLINKFILE]]
 // CLANGSUB: -o tools_directory
 
 // BINUTILS: swift
-// BINUTILS: -o [[OBJECTFILE:.*]]
+// BINUTILS-SAME: -o [[OBJECTFILE:.*]]
 // BINUTILS: swift-autolink-extract{{(\.exe)?"?}} [[OBJECTFILE]]
-// BINUTILS: -o {{"?}}[[AUTOLINKFILE:.*]]
+// BINUTILS-SAME: -o {{"?}}[[AUTOLINKFILE:.*]]
 // BINUTILS: clang
 // BINUTILS-DAG: [[OBJECTFILE]]
 // BINUTILS-DAG: @[[AUTOLINKFILE]]
@@ -31,6 +31,6 @@
 // RUN: %swiftc_driver -### -target x86_64-apple-macosx10.9 -tools-directory %S/Inputs/fake-toolchain %s 2>&1 | %FileCheck -check-prefix LDSUB %s
 
 // LDSUB: swift
-// LDSUB: -o [[OBJECTFILE:.*]]
+// LDSUB-SAME: -o [[OBJECTFILE:.*]]
 // LDSUB: {{[^ ]+(\\\\|/)}}Inputs{{/|\\\\}}fake-toolchain{{(\\\\|/)ld"?}} [[OBJECTFILE]]
 // LDSUB: -o tools_directory

tools/driver/driver.cpp

@@ -126,24 +126,6 @@ static bool shouldRunAsSubcommand(StringRef ExecName,
   return true;
 }
 
-static bool shouldDisallowNewDriver(StringRef ExecName,
-                                    const ArrayRef<const char *> argv) {
-  // We are not invoking the driver, so don't forward.
-  if (ExecName != "swift" && ExecName != "swiftc") {
-    return true;
-  }
-  // If user specified using the old driver, don't forward.
-  if (llvm::find_if(argv, [](const char* arg) {
-    return StringRef(arg) == "-disallow-use-new-driver";
-  }) != argv.end()) {
-    return true;
-  }
-  if (llvm::sys::Process::GetEnv("SWIFT_USE_OLD_DRIVER").hasValue()) {
-    return true;
-  }
-  return false;
-}
-
 static int run_driver(StringRef ExecName,
                        const ArrayRef<const char *> argv) {
   // Handle integrated tools.
@@ -178,16 +160,23 @@ static int run_driver(StringRef ExecName,
   DiagnosticEngine Diags(SM);
   Diags.addConsumer(PDC);
 
-  std::string newDriverName = "swift-driver-new";
+  std::string newDriverName;
   if (auto driverNameOp = llvm::sys::Process::GetEnv("SWIFT_USE_NEW_DRIVER")) {
     newDriverName = driverNameOp.getValue();
   }
+  auto disallowForwarding = llvm::find_if(argv, [](const char* arg) {
+    return StringRef(arg) == "-disallow-use-new-driver";
+  }) != argv.end();
   // Forwarding calls to the swift driver if the C++ driver is invoked as `swift`
   // or `swiftc`, and an environment variable SWIFT_USE_NEW_DRIVER is defined.
-  if (!shouldDisallowNewDriver(ExecName, argv)) {
+  if (!newDriverName.empty() && !disallowForwarding &&
+      (ExecName == "swift" || ExecName == "swiftc")) {
     SmallString<256> NewDriverPath(llvm::sys::path::parent_path(Path));
     llvm::sys::path::append(NewDriverPath, newDriverName);
-    if (llvm::sys::fs::exists(NewDriverPath)) {
+    if (!llvm::sys::fs::exists(NewDriverPath)) {
+      Diags.diagnose(SourceLoc(), diag::remark_forwarding_driver_not_there,
+                     NewDriverPath);
+    } else {
       SmallVector<const char *, 256> subCommandArgs;
       // Rewrite the program argument.
       subCommandArgs.push_back(NewDriverPath.c_str());