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

Discard metadata produced by LLVM 2.7. The value enumeration it used

Browse Source 
is different from what the code now uses in a two ways: NamedMDNodes
were considered Values and included in the numbering, and the
function-local metadata counter wasn't reset between functions.

The later problem breaks lazy deserialization, so instead of trying
to emulate the old numbering, just drop the old metadata. The only
in-tree use case is debug info with LTO, where the QOI loss is
considered acceptable.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@113557 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Dan Gohman
2010-09-09 23:12:39 +00:00
parent 1ab6f2fa7a
commit 70c2fc0823
4 changed files with 72 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -786,8 +786,12 @@ bool BitcodeReader::ParseMetadata() {
Record.clear();
Code = Stream.ReadCode();
// METADATA_NAME is always followed by METADATA_NAMED_NODE.
if (Stream.ReadRecord(Code, Record) != bitc::METADATA_NAMED_NODE)
// METADATA_NAME is always followed by METADATA_NAMED_NODE2.
unsigned NextBitCode = Stream.ReadRecord(Code, Record);
// FIXME: LLVM 3.0: Remove this.
if (NextBitCode == bitc::METADATA_NAMED_NODE)
break;
if (NextBitCode != bitc::METADATA_NAMED_NODE2)
assert ( 0 && "Inavlid Named Metadata record");
// Read named metadata elements.
@ -802,11 +806,19 @@ bool BitcodeReader::ParseMetadata() {
break;
}
case bitc::METADATA_FN_NODE:
// FIXME: Legacy support for the old fn_node, where function-local
// metadata operands were bogus. Remove in LLVM 3.0.
break;
case bitc::METADATA_NODE:
// FIXME: Legacy support for the old node, where function-local
// metadata operands were bogus. Remove in LLVM 3.0.
break;
case bitc::METADATA_FN_NODE2:
IsFunctionLocal = true;
// fall-through
case bitc::METADATA_NODE: {
case bitc::METADATA_NODE2: {
if (Record.size() % 2 == 1)
return Error("Invalid METADATA_NODE record");
return Error("Invalid METADATA_NODE2 record");
unsigned Size = Record.size();
SmallVector<Value*, 8> Elts;
@ -1593,7 +1605,10 @@ bool BitcodeReader::ParseMetadataAttachment() {
switch (Stream.ReadRecord(Code, Record)) {
default: // Default behavior: ignore.
break;
case bitc::METADATA_ATTACHMENT: {
case bitc::METADATA_ATTACHMENT:
// LLVM 3.0: Remove this.
break;
case bitc::METADATA_ATTACHMENT2: {
unsigned RecordLength = Record.size();
if (Record.empty() || (RecordLength - 1) % 2 == 1)
return Error ("Invalid METADATA_ATTACHMENT reader!");
@ -1706,7 +1721,11 @@ bool BitcodeReader::ParseFunctionBody(Function *F) {
I = 0;
continue;
case bitc::FUNC_CODE_DEBUG_LOC: { // DEBUG_LOC: [line, col, scope, ia]
case bitc::FUNC_CODE_DEBUG_LOC:
// FIXME: Ignore. Remove this in LLVM 3.0.
continue;
case bitc::FUNC_CODE_DEBUG_LOC2: { // DEBUG_LOC: [line, col, scope, ia]
I = 0; // Get the last instruction emitted.
if (CurBB && !CurBB->empty())
I = &CurBB->back();
@ -2221,7 +2240,12 @@ bool BitcodeReader::ParseFunctionBody(Function *F) {
InstructionList.push_back(I);
break;
}
case bitc::FUNC_CODE_INST_CALL: {
case bitc::FUNC_CODE_INST_CALL:
case bitc::FUNC_CODE_INST_CALL2: {
// FIXME: Legacy support for the old call instruction, where function-local
// metadata operands were bogus. Remove in LLVM 3.0.
bool DropMetadata = BitCode == bitc::FUNC_CODE_INST_CALL;
// CALL: [paramattrs, cc, fnty, fnid, arg0, arg1...]
if (Record.size() < 3)
return Error("Invalid CALL record");
@ -2245,7 +2269,13 @@ bool BitcodeReader::ParseFunctionBody(Function *F) {
for (unsigned i = 0, e = FTy->getNumParams(); i != e; ++i, ++OpNum) {
if (FTy->getParamType(i)->getTypeID()==Type::LabelTyID)
Args.push_back(getBasicBlock(Record[OpNum]));
else
else if (DropMetadata &&
FTy->getParamType(i)->getTypeID()==Type::MetadataTyID) {
// LLVM 2.7 compatibility: drop metadata arguments to null.
Value *Ops = 0;
Args.push_back(MDNode::get(Context, &Ops, 1));
continue;
} else
Args.push_back(getFnValueByID(Record[OpNum], FTy->getParamType(i)));
if (Args.back() == 0) return Error("Invalid CALL record");
}