Index: lib/Tooling/Execution.cpp
===================================================================
--- lib/Tooling/Execution.cpp
+++ lib/Tooling/Execution.cpp
@@ -82,7 +82,7 @@
     return std::move(*Executor);
   }
   return llvm::make_error<llvm::StringError>(
-      llvm::Twine("Executor \"") + ExecutorName + "\" is not registered.",
+      llvm::Twine("Executor \"") + *ExecutorName + "\" is not registered.",
       llvm::inconvertibleErrorCode());
 }
 } // end namespace internal
Index: tools/arcmt-test/arcmt-test.cpp
===================================================================
--- tools/arcmt-test/arcmt-test.cpp
+++ tools/arcmt-test/arcmt-test.cpp
@@ -243,7 +243,7 @@
   if (RemappingsFile.empty())
     inputBuf = MemoryBuffer::getSTDIN();
   else
-    inputBuf = MemoryBuffer::getFile(RemappingsFile);
+    inputBuf = MemoryBuffer::getFile(*RemappingsFile);
   if (!inputBuf) {
     errs() << "error: could not read remappings input\n";
     return true;
Index: tools/clang-import-test/clang-import-test.cpp
===================================================================
--- tools/clang-import-test/clang-import-test.cpp
+++ tools/clang-import-test/clang-import-test.cpp
@@ -174,7 +174,7 @@
 
   {
     using namespace driver::types;
-    ID Id = lookupTypeForTypeSpecifier(Input.c_str());
+    ID Id = lookupTypeForTypeSpecifier(Input->c_str());
     assert(Id != TY_INVALID);
     if (isCXX(Id)) {
       Inv->getLangOpts()->CPlusPlus = true;
Index: tools/clang-rename/ClangRename.cpp
===================================================================
--- tools/clang-rename/ClangRename.cpp
+++ tools/clang-rename/ClangRename.cpp
@@ -104,9 +104,9 @@
   if (!Input.empty()) {
     // Populate QualifiedNames and NewNames from a YAML file.
     ErrorOr<std::unique_ptr<MemoryBuffer>> Buffer =
-        llvm::MemoryBuffer::getFile(Input);
+        llvm::MemoryBuffer::getFile(*Input);
     if (!Buffer) {
-      errs() << "clang-rename: failed to read " << Input << ": "
+      errs() << "clang-rename: failed to read " << *Input << ": "
              << Buffer.getError().message() << "\n";
       return 1;
     }
Index: tools/diagtool/FindDiagnosticID.cpp
===================================================================
--- tools/diagtool/FindDiagnosticID.cpp
+++ tools/diagtool/FindDiagnosticID.cpp
@@ -66,7 +66,7 @@
       return 0;
     }
 
-    llvm::errs() << "error: invalid diagnostic '" << DiagnosticName << "'\n";
+    llvm::errs() << "error: invalid diagnostic '" << *DiagnosticName << "'\n";
     return 1;
   }
   OS << Diag->DiagID << "\n";
Index: unittests/Tooling/ExecutionTest.cpp
===================================================================
--- unittests/Tooling/ExecutionTest.cpp
+++ unittests/Tooling/ExecutionTest.cpp
@@ -158,7 +158,7 @@
   auto Executor = internal::createExecutorFromCommandLineArgsImpl(
       argc, &argv[0], TestCategory);
   ASSERT_TRUE((bool)Executor);
-  EXPECT_EQ(BeforeReset, "set");
+  EXPECT_EQ(*BeforeReset, "set");
   BeforeReset.removeArgument();
 }