From 3f6e798a14fa2eead887632f5ff268c8015f6b15 Mon Sep 17 00:00:00 2001 From: Brian Gaeke Date: Fri, 12 Dec 2003 00:47:19 +0000 Subject: [PATCH] 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 --- tools/lli/lli.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/lli/lli.cpp b/tools/lli/lli.cpp index 82b354dc18a..0547c433cb9 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); } -- 2.34.1