Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(232)

Side by Side Diff: src/IceCompileServer.cpp

Issue 2247253005: Subzero: Fix build errors with LLVM trunk. (Closed) Base URL: https://chromium.googlesource.com/native_client/pnacl-subzero.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 //===- subzero/src/IceCompileServer.cpp - Compile server ------------------===// 1 //===- subzero/src/IceCompileServer.cpp - Compile server ------------------===//
2 // 2 //
3 // The Subzero Code Generator 3 // The Subzero Code Generator
4 // 4 //
5 // This file is distributed under the University of Illinois Open Source 5 // This file is distributed under the University of Illinois Open Source
6 // License. See LICENSE.TXT for details. 6 // License. See LICENSE.TXT for details.
7 // 7 //
8 //===----------------------------------------------------------------------===// 8 //===----------------------------------------------------------------------===//
9 /// 9 ///
10 /// \file 10 /// \file
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 const auto &A = ConditionalBuildAttributes[i]; 164 const auto &A = ConditionalBuildAttributes[i];
165 Str << Prefix[A.FlagValue] << "_" << A.FlagName << "\n"; 165 Str << Prefix[A.FlagValue] << "_" << A.FlagName << "\n";
166 } 166 }
167 Str << "revision_" << getSubzeroRevision() << "\n"; 167 Str << "revision_" << getSubzeroRevision() << "\n";
168 } 168 }
169 169
170 } // end of anonymous namespace 170 } // end of anonymous namespace
171 171
172 void CLCompileServer::run() { 172 void CLCompileServer::run() {
173 if (BuildDefs::dump()) { 173 if (BuildDefs::dump()) {
174 #ifdef PNACL_LLVM
174 llvm::sys::PrintStackTraceOnErrorSignal(); 175 llvm::sys::PrintStackTraceOnErrorSignal();
176 #else // !PNACL_LLVM
177 llvm::sys::PrintStackTraceOnErrorSignal(argv[0]);
178 #endif // !PNACL_LLVM
175 } 179 }
176 ClFlags::parseFlags(argc, argv); 180 ClFlags::parseFlags(argc, argv);
177 ClFlags &Flags = ClFlags::Flags; 181 ClFlags &Flags = ClFlags::Flags;
178 ClFlags::getParsedClFlags(Flags); 182 ClFlags::getParsedClFlags(Flags);
179 183
180 // Override report_fatal_error if we want to exit with 0 status. 184 // Override report_fatal_error if we want to exit with 0 status.
181 if (Flags.getAlwaysExitSuccess()) 185 if (Flags.getAlwaysExitSuccess())
182 llvm::install_fatal_error_handler(reportFatalErrorThenExitSuccess, this); 186 llvm::install_fatal_error_handler(reportFatalErrorThenExitSuccess, this);
183 187
184 std::error_code EC; 188 std::error_code EC;
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 } else { 263 } else {
260 getCompiler().run(Flags, *Ctx.get(), std::move(InputStream)); 264 getCompiler().run(Flags, *Ctx.get(), std::move(InputStream));
261 } 265 }
262 transferErrorCode( 266 transferErrorCode(
263 getReturnValue(static_cast<ErrorCodes>(Ctx->getErrorStatus()->value()))); 267 getReturnValue(static_cast<ErrorCodes>(Ctx->getErrorStatus()->value())));
264 Ctx->dumpConstantLookupCounts(); 268 Ctx->dumpConstantLookupCounts();
265 Ctx->dumpStrings(); 269 Ctx->dumpStrings();
266 } 270 }
267 271
268 } // end of namespace Ice 272 } // end of namespace Ice
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698