diff options
| author | Pawel Wodnicki <pawel@32bitmicro.com> | 2012-11-21 20:30:37 +0000 |
|---|---|---|
| committer | Pawel Wodnicki <pawel@32bitmicro.com> | 2012-11-21 20:30:37 +0000 |
| commit | 7022c651cab8a4e3e310e024a2028eb9fa5b482e (patch) | |
| tree | 507c8c230efd6032097eff6dd9a17e99e10c0ceb /lib/Bitcode/Reader | |
| parent | 07d7748544abaaf97123233804a194478ed020b3 (diff) | |
Merging r168354, r168355 and r168379 into the 3.2 release branch.
Set of Attributes patches.
Merging r168354:
Make the AttrListPtr object a part of the LLVMContext.
When code deletes the context, the AttributeImpls that the AttrListPtr points to
are now invalid. Therefore, instead of keeping a separate managed static for the
AttrListPtrs that's reference counted, move it into the LLVMContext and delete
it when deleting the AttributeImpls.
Merging r168355:
Merging r168379
git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_32@168457 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Bitcode/Reader')
| -rw-r--r-- | lib/Bitcode/Reader/BitcodeReader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Bitcode/Reader/BitcodeReader.cpp b/lib/Bitcode/Reader/BitcodeReader.cpp index 279343c48c..4ec9da12dd 100644 --- a/lib/Bitcode/Reader/BitcodeReader.cpp +++ b/lib/Bitcode/Reader/BitcodeReader.cpp @@ -487,7 +487,7 @@ bool BitcodeReader::ParseAttributeBlock() { Attributes::get(Context, B))); } - MAttributes.push_back(AttrListPtr::get(Attrs)); + MAttributes.push_back(AttrListPtr::get(Context, Attrs)); Attrs.clear(); break; } |