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
diff --git a/tools/lli/lli.cpp b/tools/lli/lli.cpp
index 82b354d..0547c43 100644
--- a/tools/lli/lli.cpp
+++ b/tools/lli/lli.cpp
@@ -120,6 +120,7 @@
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 @@
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);
}