nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Introduce a string_ostream string builder facilty"

Browse Source 
Temporarily back out commits r211749, r211752 and r211754.

llvm-svn: 211814
This commit is contained in:
Alp Toker
2014-06-26 22:52:05 +00:00
parent 11c6f6165b
commit e69170a110
57 changed files with 288 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
llvm/lib/Object/MachOObjectFile.cpp
View File

@@ -301,7 +301,7 @@ static unsigned getCPUType(const MachOObjectFile *O) {
static void printRelocationTargetName(const MachOObjectFile *O,
const MachO::any_relocation_info &RE,
raw_ostream &fmt) {
raw_string_ostream &fmt) {
bool IsScattered = O->isRelocationScattered(RE);
// Target of a scattered relocation is an address. In the interest of
@@ -1010,7 +1010,8 @@ MachOObjectFile::getRelocationValueString(DataRefImpl Rel,
unsigned Arch = this->getArch();
string_ostream fmt;
std::string fmtbuf;
raw_string_ostream fmt(fmtbuf);
unsigned Type = this->getAnyRelocationType(RE);
bool IsPCRel = this->getAnyRelocationPCRel(RE);
@@ -1173,7 +1174,7 @@ MachOObjectFile::getRelocationValueString(DataRefImpl Rel,
} else
printRelocationTargetName(this, RE, fmt);
StringRef fmtbuf = fmt.str();
fmt.flush();
Result.append(fmtbuf.begin(), fmtbuf.end());
return object_error::success;
}