RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-18 18:42:46 +02:00
Code Issues Projects Releases Wiki Activity

[llvm] Fix D26214: Move error handling out of MC and to the callers.

Browse Source 
Summary: Related clang patch; https://reviews.llvm.org/D27360

Reviewers: t.p.northover, grosbach, compnerd, echristo

Subscribers: compnerd, mehdi_amini, llvm-commits

Differential Revision: https://reviews.llvm.org/D27359

llvm-svn: 288763
This commit is contained in:
Mandeep Singh Grang 2016-12-06 02:49:17 +00:00
parent 462c2eed9d
commit 62bc2fc3e6
3 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/llvm/MC/MCContext.h
View File

@ -303,7 +303,7 @@ namespace llvm {
MCSymbol *lookupSymbol(const Twine &Name) const;
/// Set value for a symbol.
int setSymbolValue(MCStreamer &Streamer, std::string &I);
void setSymbolValue(MCStreamer &Streamer, StringRef Sym, uint64_t Val);
/// getSymbols - Get a reference for the symbol table for clients that
/// want to, for example, iterate over all symbols. 'const' because we

19
lib/MC/MCContext.cpp
View File

@ -260,20 +260,11 @@ MCSymbol *MCContext::lookupSymbol(const Twine &Name) const {
return Symbols.lookup(NameRef);
}
int MCContext::setSymbolValue(MCStreamer &Streamer, std::string &I) {
auto Pair = StringRef(I).split('=');
if (Pair.second.empty()) {
errs() << "error: defsym must be of the form: sym=value: " << I << "\n";
return 1;
}
int64_t Value;
if (Pair.second.getAsInteger(0, Value)) {
errs() << "error: Value is not an integer: " << Pair.second << "\n";
return 1;
}
auto Symbol = getOrCreateSymbol(Pair.first);
Streamer.EmitAssignment(Symbol, MCConstantExpr::create(Value, *this));
return 0;
void MCContext::setSymbolValue(MCStreamer &Streamer,
StringRef Sym,
uint64_t Val) {
auto Symbol = getOrCreateSymbol(Sym);
Streamer.EmitAssignment(Symbol, MCConstantExpr::create(Val, *this));
}
//===----------------------------------------------------------------------===//

17
tools/llvm-mc/llvm-mc.cpp
View File

@ -394,9 +394,22 @@ static int AsLexInput(SourceMgr &SrcMgr, MCAsmInfo &MAI,
}
static int fillCommandLineSymbols(MCAsmParser &Parser) {
for (auto &I: DefineSymbol)
if (Parser.getContext().setSymbolValue(Parser.getStreamer(), I))
for (auto &I: DefineSymbol) {
auto Pair = StringRef(I).split('=');
auto Sym = Pair.first;
auto Val = Pair.second;
if (Sym.empty() || Val.empty()) {
errs() << "error: defsym must be of the form: sym=value: " << I << "\n";
return 1;
}
int64_t Value;
if (Val.getAsInteger(0, Value)) {
errs() << "error: Value is not an integer: " << Val << "\n";
return 1;
}
Parser.getContext().setSymbolValue(Parser.getStreamer(), Sym, Value);
}
return 0;
}