From 57625a49666614860430a2b3d81600ead4df0fd5 Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Fri, 25 Jan 2013 23:09:36 +0000 Subject: Remove some introspection functions. The 'getSlot' function and its ilk allow introspection into the AttributeSet class. However, that class should be opaque. Allow access through accessor methods instead. llvm-svn: 173522 --- llvm/lib/Bitcode/Reader/BitcodeReader.cpp | 2 +- llvm/lib/Bitcode/Writer/BitcodeWriter.cpp | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'llvm/lib/Bitcode') diff --git a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp index f09b93b33a5..4190161b62e 100644 --- a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp +++ b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp @@ -465,7 +465,7 @@ bool BitcodeReader::ParseAttributeBlock() { for (unsigned i = 0, e = Record.size(); i != e; i += 2) { Attribute ReconstitutedAttr = - Attribute::decodeLLVMAttributesForBitcode(Context, Record[i+1]); + AttributeFuncs::decodeLLVMAttributesForBitcode(Context, Record[i+1]); Record[i+1] = ReconstitutedAttr.Raw(); } diff --git a/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp b/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp index cc6b8b39fbd..b6c2bc0f750 100644 --- a/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp +++ b/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp @@ -173,9 +173,11 @@ static void WriteAttributeTable(const ValueEnumerator &VE, for (unsigned i = 0, e = Attrs.size(); i != e; ++i) { const AttributeSet &A = Attrs[i]; for (unsigned i = 0, e = A.getNumSlots(); i != e; ++i) { - const AttributeWithIndex &PAWI = A.getSlot(i); - Record.push_back(A.getSlotIndex(i)); - Record.push_back(Attribute::encodeLLVMAttributesForBitcode(PAWI.Attrs)); + unsigned Index = A.getSlotIndex(i); + Record.push_back(Index); + Record.push_back(AttributeFuncs:: + encodeLLVMAttributesForBitcode(A.getSlotAttributes(i), + Index)); } Stream.EmitRecord(bitc::PARAMATTR_CODE_ENTRY, Record); -- cgit v1.2.3