[llvm-commits] CVS: llvm/tools/lli/lli.cpp

[Brian Gaeke]

Changes in directory llvm/tools/lli:

lli.cpp updated: 1.35 -> 1.36

---
Log message:

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.


---
Diffs of the changes:  (+2 -1)

Index: llvm/tools/lli/lli.cpp
diff -u llvm/tools/lli/lli.cpp:1.35 llvm/tools/lli/lli.cpp:1.36
--- llvm/tools/lli/lli.cpp:1.35	Tue Nov 11 16:41:34 2003
+++ llvm/tools/lli/lli.cpp	Thu Dec 11 18:47:19 2003
@@ -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);
   }