summaryrefslogtreecommitdiff
path: root/tools/lli
diff options
context:
space:
mode:
authorBrian Gaeke <gaeke@uiuc.edu>2003-12-12 00:47:19 +0000
committerBrian Gaeke <gaeke@uiuc.edu>2003-12-12 00:47:19 +0000
commit3f6e798a14fa2eead887632f5ff268c8015f6b15 (patch)
treefff0245db94f84151fb7dfd873d3c0575e21ce5a /tools/lli
parent2d9d4e740bd3ac7a79467530c96ca9acf8e7c303 (diff)
downloadllvm-3f6e798a14fa2eead887632f5ff268c8015f6b15.tar.gz
llvm-3f6e798a14fa2eead887632f5ff268c8015f6b15.tar.bz2
llvm-3f6e798a14fa2eead887632f5ff268c8015f6b15.tar.xz
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. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@10414 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/lli')
-rw-r--r--tools/lli/lli.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/lli/lli.cpp b/tools/lli/lli.cpp
index 82b354dc18..0547c433cb 100644
--- a/tools/lli/lli.cpp
+++ b/tools/lli/lli.cpp
@@ -120,6 +120,7 @@ int callAsMain(ExecutionEngine *EE, ModuleProvider *MP,
GVArgc.IntVal = Args.size();
GVArgs.push_back(GVArgc); // Arg #0 = argc.
GVArgs.push_back(PTOGV(CreateArgv(EE, Args))); // Arg #1 = argv.
+ assert(((char **)GVTOP(GVArgs[1]))[0] && "argv[0] was null after CreateArgv");
GVArgs.push_back(PTOGV(CreateArgv(EE, EnvVars))); // Arg #2 = envp.
return EE->run(Fn, GVArgs).IntVal;
}
@@ -137,7 +138,7 @@ int main(int argc, char **argv, char * const *envp) {
try {
MP = getBytecodeModuleProvider(InputFile);
} catch (std::string &err) {
- std::cerr << "Error parsing '" << InputFile << "': " << err << "\n";
+ std::cerr << "Error loading program '" << InputFile << "': " << err << "\n";
exit(1);
}