Skip to content

Commit b0e067b

Browse files
committed
[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 llvm-svn: 286396
1 parent 76b4261 commit b0e067b

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

llvm/tools/lli/lli.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,8 @@ int main(int argc, char **argv, char * const *envp) {
418418

419419
// If not jitting lazily, load the whole bitcode file eagerly too.
420420
if (NoLazyCompilation) {
421-
ExitOnError ExitOnErr(std::string(argv[0]) +
421+
// Use *argv instead of argv[0] to work around a wrong GCC warning.
422+
ExitOnError ExitOnErr(std::string(*argv) +
422423
": bitcode didn't read correctly: ");
423424
ExitOnErr(Mod->materializeAll());
424425
}

llvm/tools/llvm-extract/llvm-extract.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,8 @@ int main(int argc, char **argv) {
223223
}
224224
}
225225

226-
ExitOnError ExitOnErr(std::string(argv[0]) + ": error reading input: ");
226+
// Use *argv instead of argv[0] to work around a wrong GCC warning.
227+
ExitOnError ExitOnErr(std::string(*argv) + ": error reading input: ");
227228

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

0 commit comments

Comments
 (0)