From: Erich Keane <erich.keane@intel.com>
Date: Mon, 12 Feb 2018 17:47:01 +0000 (+0000)
Subject: Further cleanup to Driver mode code, as suggested by dblaikie [NFC]
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=30fc4fa07c2958fe988d86514ca8323976634d6a;p=clang

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


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@324915 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
index bbfdaefaf3..88412e3595 100644
--- a/lib/Driver/Driver.cpp
+++ b/lib/Driver/Driver.cpp
@@ -148,15 +148,13 @@ void Driver::setDriverModeFromOption(StringRef Opt) {
     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;
 }