commit 2908a04301a959b44b60d66c1fc5b051e7b86c28
author Erich Keane <erich.keane@intel.com> Mon Feb 12 17:47:01 2018 +0000
committer Erich Keane <erich.keane@intel.com> Mon Feb 12 17:47:01 2018 +0000
tree 10546b7781a64419e31d7c0388663227922ec346
parent 31b97194e65a55b75f10155c7216f0cf9124573e

Further cleanup to Driver mode code, as suggested by dblaikie [NFC]

llvm-svn: 324915

clang/lib/Driver/Driver.cpp

diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
index bbfdaef..88412e3 100644
--- a/clang/lib/Driver/Driver.cpp
+++ b/clang/lib/Driver/Driver.cpp
@@ -148,15 +148,13 @@
     return;
   StringRef Value = Opt.drop_front(OptName.size());
 
-  auto M = llvm::StringSwitch<llvm::Optional<DriverMode>>(Value)
-                           .Case("gcc", GCCMode)
-                           .Case("g++", GXXMode)
-                           .Case("cpp", CPPMode)
-                           .Case("cl", CLMode)
-                           .Default(None);
-
-  if (M)
-    Mode = M.getValue();
+  if (auto M = llvm::StringSwitch<llvm::Optional<DriverMode>>(Value)
+                   .Case("gcc", GCCMode)
+                   .Case("g++", GXXMode)
+                   .Case("cpp", CPPMode)
+                   .Case("cl", CLMode)
+                   .Default(None))
+    Mode = *M;
   else
     Diag(diag::err_drv_unsupported_option_argument) << OptName << Value;
 }