[tools] Unbreak the GCC build (workaround a GCC bug).

../tools/llvm-extract/llvm-extract.cpp: In function ‘int main(int, char**)’:
warning: ISO C++ forbids zero-size array ‘argv’ [-Wpedantic]

GCC reference bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61259

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

diff --git a/tools/lli/lli.cpp b/tools/lli/lli.cpp
index 7923e8fe42d9950eb633022e4cc650b28fb080c3..605893e0ba25e7b5750d367b907857a6c6b0c4a5 100644 (file)
--- a/tools/lli/lli.cpp
+++ b/tools/lli/lli.cpp
@@ -418,7 +418,8 @@ int main(int argc, char **argv, char * const *envp) {
 
   // If not jitting lazily, load the whole bitcode file eagerly too.
   if (NoLazyCompilation) {
-    ExitOnError ExitOnErr(std::string(argv[0]) +
+    // Use *argv instead of argv[0] to work around a wrong GCC warning.
+    ExitOnError ExitOnErr(std::string(*argv) +
                           ": bitcode didn't read correctly: ");
     ExitOnErr(Mod->materializeAll());
   }

diff --git a/tools/llvm-extract/llvm-extract.cpp b/tools/llvm-extract/llvm-extract.cpp
index e576d0893bf5e052f96f6ab176a63dc68d98f41c..aa1eda2f094a63af8b7a8fd6dd3010be7b1f9710 100644 (file)
--- a/tools/llvm-extract/llvm-extract.cpp
+++ b/tools/llvm-extract/llvm-extract.cpp
@@ -223,7 +223,8 @@ int main(int argc, char **argv) {
     }
   }
 
-  ExitOnError ExitOnErr(std::string(argv[0]) + ": error reading input: ");
+  // Use *argv instead of argv[0] to work around a wrong GCC warning.
+  ExitOnError ExitOnErr(std::string(*argv) + ": error reading input: ");
 
   auto Materialize = [&](GlobalValue &GV) { ExitOnErr(GV.materialize()); };