Address review comments.

Author: troughton

lib/Driver/Driver.cpp

@@ -212,21 +212,19 @@ makeToolChain(Driver &driver, const llvm::Triple &target) {
     return llvm::make_unique<toolchains::Darwin>(driver, target);
     break;
   case llvm::Triple::Linux:
-    if (target.isAndroid()) {
+    if (target.isAndroid())
       return llvm::make_unique<toolchains::Android>(driver, target);
-    } else {
+    else
       return llvm::make_unique<toolchains::GenericUnix>(driver, target);
-    }
     break;
   case llvm::Triple::FreeBSD:
     return llvm::make_unique<toolchains::GenericUnix>(driver, target);
     break;
   case llvm::Triple::Win32: 
-    if (target.isWindowsCygwinEnvironment()) {
+    if (target.isWindowsCygwinEnvironment())
       return llvm::make_unique<toolchains::Cygwin>(driver, target);
-    } else {
+    else
       return llvm::make_unique<toolchains::Windows>(driver, target);
-    }
     break;
   case llvm::Triple::Haiku:
     return llvm::make_unique<toolchains::GenericUnix>(driver, target);

lib/Driver/ToolChains.cpp

@@ -1114,7 +1114,7 @@ getSanitizerRuntimeLibNameForDarwin(StringRef Sanitizer,
 }
 
 static std::string getSanitizerRuntimeLibNameForWindows(
-    StringRef Sanitizer, const llvm::Triple &Triple, bool shared = true) {
+    StringRef Sanitizer, const llvm::Triple &Triple) {
   return (Twine("clang_rt.") + Sanitizer + "-" + Triple.getArchName() + ".lib")
       .str();
 }
@@ -1225,14 +1225,10 @@ addLinkSanitizerLibArgsForDarwin(const ArgList &Args,
 static void addLinkSanitizerLibArgsForWindows(const ArgList &Args,
                                               ArgStringList &Arguments,
                                               StringRef Sanitizer,
-                                              const ToolChain &TC,
-                                              bool shared = true) {
-  // Sanitizer runtime libraries requires C++.
-  Arguments.push_back("-lc++");
-
+                                              const ToolChain &TC) {
   addLinkRuntimeLibForWindows(
       Args, Arguments,
-      getSanitizerRuntimeLibNameForWindows(Sanitizer, TC.getTriple(), shared),
+      getSanitizerRuntimeLibNameForWindows(Sanitizer, TC.getTriple()),
       TC);
 }
 
@@ -1571,16 +1567,10 @@ toolchains::Windows::constructInvocation(const LinkJobAction &job,
     Arguments.push_back(context.Args.MakeArgString(Target));
   }
 
-  bool staticExecutable = false;
-  bool staticStdlib = false;
-
-  if (context.Args.hasFlag(options::OPT_static_executable,
-                           options::OPT_no_static_executable, false)) {
-    staticExecutable = true;
-  } else if (context.Args.hasFlag(options::OPT_static_stdlib,
-                                  options::OPT_no_static_stdlib, false)) {
-    staticStdlib = true;
-  }
+  bool staticExecutable = context.Args.hasFlag(
+      options::OPT_static_executable, options::OPT_no_static_executable, false);
+  bool staticStdlib = context.Args.hasFlag(
+      options::OPT_static_stdlib, options::OPT_no_static_stdlib, false);
 
   SmallString<128> SharedRuntimeLibPath;
   getRuntimeLibraryPath(SharedRuntimeLibPath, context.Args, *this);