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

Add support for empty metadata nodes: !{}.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@108259 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Dan Gohman
2010-07-13 19:33:27 +00:00
parent 218977b53e
commit ac80975ea4
4 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/AsmParser/LLParser.cpp
View File

@ -3983,6 +3983,10 @@ int LLParser::ParseInsertValue(Instruction *&Inst, PerFunctionState &PFS) {
/// ::= 'null' | TypeAndValue /// ::= 'null' | TypeAndValue
bool LLParser::ParseMDNodeVector(SmallVectorImpl<Value*> &Elts, bool LLParser::ParseMDNodeVector(SmallVectorImpl<Value*> &Elts,
PerFunctionState *PFS) { PerFunctionState *PFS) {
// Check for an empty list.
if (Lex.getKind() == lltok::rbrace)
return false;
do { do {
// Null is a special case since it is typeless. // Null is a special case since it is typeless.
if (EatIfPresent(lltok::kw_null)) { if (EatIfPresent(lltok::kw_null)) {

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

@ -820,7 +820,7 @@ bool BitcodeReader::ParseMetadata() {
IsFunctionLocal = true; IsFunctionLocal = true;
// fall-through // fall-through
case bitc::METADATA_NODE: { case bitc::METADATA_NODE: {
if (Record.empty() || Record.size() % 2 == 1) if (Record.size() % 2 == 1)
return Error("Invalid METADATA_NODE record"); return Error("Invalid METADATA_NODE record");
unsigned Size = Record.size(); unsigned Size = Record.size();
@ -834,7 +834,8 @@ bool BitcodeReader::ParseMetadata() {
else else
Elts.push_back(NULL); Elts.push_back(NULL);
} }
Value *V = MDNode::getWhenValsUnresolved(Context, &Elts[0], Elts.size(), Value *V = MDNode::getWhenValsUnresolved(Context,
Elts.data(), Elts.size(),
IsFunctionLocal); IsFunctionLocal);
IsFunctionLocal = false; IsFunctionLocal = false;
MDValueList.AssignValue(V, NextMDValueNo++); MDValueList.AssignValue(V, NextMDValueNo++);

3
lib/VMCore/Metadata.cpp
View File

@ -78,7 +78,8 @@ void MDNodeOperand::allUsesReplacedWith(Value *NV) {
/// getOperandPtr - Helper function to get the MDNodeOperand's coallocated on /// getOperandPtr - Helper function to get the MDNodeOperand's coallocated on
/// the end of the MDNode. /// the end of the MDNode.
static MDNodeOperand *getOperandPtr(MDNode *N, unsigned Op) { static MDNodeOperand *getOperandPtr(MDNode *N, unsigned Op) {
assert(Op < N->getNumOperands() && "Invalid operand number"); // Use <= instead of < to permit a one-past-the-end address.
assert(Op <= N->getNumOperands() && "Invalid operand number");
return reinterpret_cast<MDNodeOperand*>(N+1)+Op; return reinterpret_cast<MDNodeOperand*>(N+1)+Op;
} }

3
test/Feature/metadata.ll
View File

@ -10,4 +10,5 @@ declare void @llvm.zonk(metadata, i64, metadata) nounwind readnone
!named = !{!0} !named = !{!0}
!0 = metadata !{i8** null} !0 = metadata !{i8** null}
!1 = metadata !{i8* null} !1 = metadata !{i8* null, metadata !2}
!2 = metadata !{}