Index: tools/lli/lli.cpp
===================================================================
--- tools/lli/lli.cpp
+++ tools/lli/lli.cpp
@@ -418,7 +418,7 @@

   // If not jitting lazily, load the whole bitcode file eagerly too.
   if (NoLazyCompilation) {
-    ExitOnError ExitOnErr(std::string(argv[0]) +
+    ExitOnError ExitOnErr(std::string(*argv) +
                           ": bitcode didn't read correctly: ");
     ExitOnErr(Mod->materializeAll());
   }
Index: tools/llvm-extract/llvm-extract.cpp
===================================================================
--- tools/llvm-extract/llvm-extract.cpp
+++ tools/llvm-extract/llvm-extract.cpp
@@ -223,7 +223,7 @@
     }
   }

-  ExitOnError ExitOnErr(std::string(argv[0]) + ": error reading input: ");
+  ExitOnError ExitOnErr(std::string(*argv) + ": error reading input: ");

   auto Materialize = [&](GlobalValue &GV) { ExitOnErr(GV.materialize()); };