Chromium Code Reviews| Index: src/IceBrowserCompileServer.cpp |
| diff --git a/src/IceBrowserCompileServer.cpp b/src/IceBrowserCompileServer.cpp |
| index 6baf62dec1bf13b6a70bb37bc619864c42db5009..5780c69404931f111e9c834574ec4eeec9815df5 100644 |
| --- a/src/IceBrowserCompileServer.cpp |
| +++ b/src/IceBrowserCompileServer.cpp |
| @@ -165,14 +165,14 @@ void BrowserCompileServer::run() { |
| void BrowserCompileServer::getParsedFlags(uint32_t NumThreads, int argc, |
| char **argv) { |
| ClFlags::parseFlags(argc, argv); |
| - ClFlags::getParsedClFlags(*Flags); |
| + ClFlags::getParsedClFlags(ClFlags::Flags); |
| // Set some defaults which aren't specified via the argv string. |
| - Flags->setNumTranslationThreads(NumThreads); |
| - Flags->setUseSandboxing(true); |
| - Flags->setOutFileType(FT_Elf); |
| - Flags->setTargetArch(getTargetArch()); |
| - Flags->setBuildOnRead(true); |
| - Flags->setInputFileFormat(llvm::PNaClFormat); |
| + ClFlags::Flags.setNumTranslationThreads(NumThreads); |
| + ClFlags::Flags.setUseSandboxing(true); |
| + ClFlags::Flags.setOutFileType(FT_Elf); |
| + ClFlags::Flags.setTargetArch(getTargetArch()); |
| + ClFlags::Flags.setBuildOnRead(true); |
|
Jim Stichnoth
2016/04/01 23:36:58
I think you can and should remove this because the
Karl
2016/04/02 16:55:55
Removed BuildOnRead, left InputFileFormat for anot
|
| + ClFlags::Flags.setInputFileFormat(llvm::PNaClFormat); |
| } |
| bool BrowserCompileServer::pushInputBytes(const void *Data, size_t NumBytes) { |
| @@ -219,7 +219,7 @@ void BrowserCompileServer::startCompileThread(int ObjFD) { |
| CompileThread = std::thread([this]() { |
| llvm::install_fatal_error_handler(fatalErrorHandler, this); |
| Ctx->initParserThread(); |
| - this->getCompiler().run(*Flags, *Ctx.get(), |
| + this->getCompiler().run(ClFlags::Flags, *Ctx.get(), |
| // Retain original reference, but the compiler |
| // (LLVM's MemoryObject) wants to handle deletion. |
| std::unique_ptr<llvm::DataStreamer>(InputStream)); |