6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-14 14:24:05 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Convert a few std::strings to StringRef."

Browse Source 
This reverts commit r212342.

We can get a StringRef into the current Record, but not one in the bitcode
itself since the string is compressed in it.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@212356 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola
2014-07-04 20:02:42 +00:00
parent d4921230be
commit c77a7749ff
4 changed files with 17 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/Bitcode/Reader/BitcodeReader.cpp
View File

@ -71,15 +71,6 @@ static bool ConvertToString(ArrayRef<uint64_t> Record, unsigned Idx,
return false;
}
ErrorOr<StringRef> BitcodeReader::convertToStringRef(ArrayRef<uint64_t> Record,
unsigned Idx) {
if (Idx > Record.size())
return Error(InvalidRecord);
return StringRef((char*)&Record[Idx], Record.size() - Idx);
}
static GlobalValue::LinkageTypes GetDecodedLinkage(unsigned Val) {
switch (Val) {
default: // Map unknown/new linkages to external
@ -2125,13 +2116,13 @@ std::error_code BitcodeReader::ParseBitcodeInto(Module *M) {
}
}
ErrorOr<StringRef> BitcodeReader::parseModuleTriple() {
ErrorOr<std::string> BitcodeReader::parseModuleTriple() {
if (Stream.EnterSubBlock(bitc::MODULE_BLOCK_ID))
return Error(InvalidRecord);
SmallVector<uint64_t, 64> Record;
StringRef Triple;
std::string Triple;
// Read all the records for this module.
while (1) {
BitstreamEntry Entry = Stream.advanceSkippingSubblocks();
@ -2151,10 +2142,10 @@ ErrorOr<StringRef> BitcodeReader::parseModuleTriple() {
switch (Stream.readRecord(Entry.ID, Record)) {
default: break; // Default behavior, ignore unknown content.
case bitc::MODULE_CODE_TRIPLE: { // TRIPLE: [strchr x N]
ErrorOr<StringRef> S = convertToStringRef(Record, 0);
if (std::error_code EC = S.getError())
return EC;
Triple = S.get();
std::string S;
if (ConvertToString(Record, 0, S))
return Error(InvalidRecord);
Triple = S;
break;
}
}
@ -2163,7 +2154,7 @@ ErrorOr<StringRef> BitcodeReader::parseModuleTriple() {
return Triple;
}
ErrorOr<StringRef> BitcodeReader::parseTriple() {
ErrorOr<std::string> BitcodeReader::parseTriple() {
if (std::error_code EC = InitStream())
return EC;
@ -3478,10 +3469,10 @@ ErrorOr<Module *> llvm::parseBitcodeFile(MemoryBuffer *Buffer,
return M;
}
StringRef llvm::getBitcodeTargetTriple(MemoryBuffer *Buffer,
LLVMContext &Context) {
std::string llvm::getBitcodeTargetTriple(MemoryBuffer *Buffer,
LLVMContext &Context) {
BitcodeReader *R = new BitcodeReader(Buffer, Context);
ErrorOr<StringRef> Triple = R->parseTriple();
ErrorOr<std::string> Triple = R->parseTriple();
R->releaseBuffer();
delete R;
if (Triple.getError())

9
lib/Bitcode/Reader/BitcodeReader.h
View File

@ -196,9 +196,6 @@ class BitcodeReader : public GVMaterializer {
static const std::error_category &BitcodeErrorCategory();
static ErrorOr<StringRef> convertToStringRef(ArrayRef<uint64_t> Record,
unsigned Idx);
public:
enum ErrorType {
BitcodeStreamInvalidSize,
@ -223,7 +220,7 @@ public:
InvalidValue // Invalid version, inst number, attr number, etc
};
static std::error_code Error(ErrorType E) {
std::error_code Error(ErrorType E) {
return std::error_code(E, BitcodeErrorCategory());
}
@ -255,7 +252,7 @@ public:
/// @brief Cheap mechanism to just extract module triple
/// @returns true if an error occurred.
ErrorOr<StringRef> parseTriple();
ErrorOr<std::string> parseTriple();
static uint64_t decodeSignRotatedValue(uint64_t V);
@ -357,7 +354,7 @@ private:
std::error_code ResolveGlobalAndAliasInits();
std::error_code ParseMetadata();
std::error_code ParseMetadataAttachment();
ErrorOr<StringRef> parseModuleTriple();
ErrorOr<std::string> parseModuleTriple();
std::error_code ParseUseLists();
std::error_code InitStream();
std::error_code InitStreamFromBuffer();