summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorPawel Wodnicki <pawel@32bitmicro.com>2012-11-21 20:30:37 +0000
committerPawel Wodnicki <pawel@32bitmicro.com>2012-11-21 20:30:37 +0000
commit7022c651cab8a4e3e310e024a2028eb9fa5b482e (patch)
tree507c8c230efd6032097eff6dd9a17e99e10c0ceb /utils
parent07d7748544abaaf97123233804a194478ed020b3 (diff)
downloadllvm-7022c651cab8a4e3e310e024a2028eb9fa5b482e.tar.gz
llvm-7022c651cab8a4e3e310e024a2028eb9fa5b482e.tar.bz2
llvm-7022c651cab8a4e3e310e024a2028eb9fa5b482e.tar.xz
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 'utils')
-rw-r--r--utils/TableGen/IntrinsicEmitter.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/utils/TableGen/IntrinsicEmitter.cpp b/utils/TableGen/IntrinsicEmitter.cpp
index e1910784a6..fe55242930 100644
--- a/utils/TableGen/IntrinsicEmitter.cpp
+++ b/utils/TableGen/IntrinsicEmitter.cpp
@@ -621,7 +621,7 @@ EmitAttributes(const std::vector<CodeGenIntrinsic> &Ints, raw_ostream &OS) {
OS << " }\n";
OS << " }\n";
- OS << " return AttrListPtr::get(ArrayRef<AttributeWithIndex>(AWI, "
+ OS << " return AttrListPtr::get(C, ArrayRef<AttributeWithIndex>(AWI, "
"NumAttrs));\n";
OS << "}\n";
OS << "#endif // GET_INTRINSIC_ATTRIBUTES\n\n";