[clang][cas] Fix hasValue/getValue warnings

Author: benlangmuir

clang/lib/Tooling/DependencyScanning/DependencyScanningTool.cpp

@@ -310,13 +310,13 @@ IncludeTreePPConsumer::getObjectForFile(Preprocessor &PP, FileID FID) {
   }
   assert(FI.getContentCache().OrigEntry);
   auto &FileRef = ObjectForFile[FI.getContentCache().OrigEntry];
-  if (!FileRef.hasValue()) {
+  if (!FileRef) {
     auto Ref = getObjectForFileNonCached(SM.getFileManager(), FI);
     if (!Ref)
       return Ref.takeError();
     FileRef = *Ref;
   }
-  return FileRef.getValue();
+  return *FileRef;
 }
 
 Expected<cas::ObjectRef>

clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp

@@ -163,7 +163,7 @@ struct IncludeTreePPCallbacks : public PPCallbacks {
   void HasInclude(SourceLocation Loc, StringRef FileName, bool IsAngled,
                   Optional<FileEntryRef> File,
                   SrcMgr::CharacteristicKind FileType) override {
-    Consumer.handleHasIncludeCheck(PP, File.hasValue());
+    Consumer.handleHasIncludeCheck(PP, File.has_value());
   }
 };
 

clang/tools/driver/cc1depscanProtocol.cpp

@@ -154,7 +154,7 @@ Expected<ScanDaemon> ScanDaemon::launchDaemon(StringRef BasePath,
 
   static bool LaunchTestDaemon =
       llvm::sys::Process::GetEnv("__CLANG_TEST_CC1DEPSCAND_SHUTDOWN")
-          .hasValue();
+          .has_value();
 
   ArrayRef<const char *> InitialArgs =
       LaunchTestDaemon ? makeArrayRef(ArgsTestMode) : makeArrayRef(Args);

clang/tools/driver/cc1depscan_main.cpp

@@ -309,7 +309,7 @@ makeDepscanDaemonKey(StringRef Mode, const DepscanSharing &Sharing) {
   };
 
   if (Sharing.ShareViaIdentifier)
-    return makeIdentifierKey(Sharing.Name.getValue());
+    return makeIdentifierKey(*Sharing.Name);
 
   if (Sharing.Name) {
     // Check for fast path, which doesn't need to look up process names: