Skip to content

Commit 1f14737

Browse files
author
Brian Gaeke
committed
Add an assertion to make sure we are at least getting argv[0] right.
Use a clearer error message when we fail to load a program. llvm-svn: 10414
1 parent e4151eb commit 1f14737

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

llvm/tools/lli/lli.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ int callAsMain(ExecutionEngine *EE, ModuleProvider *MP,
120120
GVArgc.IntVal = Args.size();
121121
GVArgs.push_back(GVArgc); // Arg #0 = argc.
122122
GVArgs.push_back(PTOGV(CreateArgv(EE, Args))); // Arg #1 = argv.
123+
assert(((char **)GVTOP(GVArgs[1]))[0] && "argv[0] was null after CreateArgv");
123124
GVArgs.push_back(PTOGV(CreateArgv(EE, EnvVars))); // Arg #2 = envp.
124125
return EE->run(Fn, GVArgs).IntVal;
125126
}
@@ -137,7 +138,7 @@ int main(int argc, char **argv, char * const *envp) {
137138
try {
138139
MP = getBytecodeModuleProvider(InputFile);
139140
} catch (std::string &err) {
140-
std::cerr << "Error parsing '" << InputFile << "': " << err << "\n";
141+
std::cerr << "Error loading program '" << InputFile << "': " << err << "\n";
141142
exit(1);
142143
}
143144

0 commit comments

Comments
 (0)