Add argv[0] before parsing commandline flags.

src/IceBrowserCompileServer.cpp

 //===- subzero/src/IceBrowserCompileServer.cpp - Browser compile server ---===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file defines the browser-based compile server.
@@ skipping 23 matching lines @@
 
 void getIRTInterfaces() {
   size_t QueryResult =
       nacl_interface_query(NACL_IRT_PRIVATE_PNACL_TRANSLATOR_COMPILE_v0_1,
                            &gIRTFuncs, sizeof(gIRTFuncs));
   if (QueryResult != sizeof(gIRTFuncs))
     llvm::report_fatal_error("Failed to get translator compile IRT interface");
 }
 
 char *onInitCallback(uint32_t NumThreads, int *ObjFileFDs,
-                     size_t ObjFileFDCount, char **argv, size_t argc) {
+                     size_t ObjFileFDCount, char **CLArgs, size_t CLArgsLen) {
   if (ObjFileFDCount < 1) {
     std::string Buffer;
     llvm::raw_string_ostream StrBuf(Buffer);
     StrBuf << "Invalid number of FDs for onInitCallback " << ObjFileFDCount
            << "\n";
     return strdup(StrBuf.str().c_str());
   }
   int ObjFileFD = ObjFileFDs[0];
   if (ObjFileFD < 0) {
     std::string Buffer;
     llvm::raw_string_ostream StrBuf(Buffer);
     StrBuf << "Invalid FD given for onInitCallback " << ObjFileFD << "\n";
     return strdup(StrBuf.str().c_str());
   }
-  // NOTE: argv is owned by the caller, but we parse here before returning.
-  gCompileServer->getParsedFlags(NumThreads, argc, argv);
+  // CLArgs is almost an "argv", but is missing the argv[0] program name.
+  std::vector<char *> Argv;

[Mircea Trofin, 2015/03/31 17:24:04]

you could just 
std::vector<char *> Argv(CLArgsLen + 1)

and then no need to reserve at line 62

[Jim Stichnoth, 2015/03/31 17:26:44]

True, but then the push_back() calls have to be replaced with direct indexes and
you have to be more careful if you decide to push things in a different order,
so ...

[jvoung (off chromium), 2015/03/31 20:41:16]

Hmm, I'll stick with reserve() then. Another option could have been to use
SmallVector<char *, 16>, which should be good enough for most cases.

+  char ProgramName[] = "pnacl-sz.nexe";
+  Argv.reserve(CLArgsLen + 1);
+  Argv.push_back(ProgramName);
+  for (size_t i = 0; i < CLArgsLen; ++i) {
+    Argv.push_back(CLArgs[i]);
+  }
+  // NOTE: strings pointed to by argv are owned by the caller, but we parse
+  // here before returning and don't store them.
+  gCompileServer->getParsedFlags(NumThreads, Argv.size(), Argv.data());
   gCompileServer->startCompileThread(ObjFileFD);
   return nullptr;
 }
 
 int onDataCallback(const void *Data, size_t NumBytes) {
   return gCompileServer->pushInputBytes(Data, NumBytes) ? 1 : 0;
 }
 
 char *onEndCallback() {
   gCompileServer->endInputStream();
@@ skipping 70 matching lines @@
     this->getCompiler().run(ExtraFlags, *Ctx.get(),
                             // Retain original reference, but the compiler
                             // (LLVM's MemoryObject) wants to handle deletion.
                             std::unique_ptr<llvm::DataStreamer>(InputStream));
   });
 }
 
 } // end of namespace Ice
 
 #endif // PNACL_BROWSER_TRANSLATOR