diff options
author | Duncan Sands <baldrick@free.fr> | 2007-11-20 14:09:29 +0000 |
---|---|---|
committer | Duncan Sands <baldrick@free.fr> | 2007-11-20 14:09:29 +0000 |
commit | 5e41f6569918a6e001cadf8dea96819686cf301c (patch) | |
tree | b185f354f83376786eef43ac3ae56f38be5f95e5 /lib/VMCore/Function.cpp | |
parent | 6e801dc6c0a7b04e154f5fbb3a2b04cc355d194d (diff) | |
download | external_llvm-5e41f6569918a6e001cadf8dea96819686cf301c.zip external_llvm-5e41f6569918a6e001cadf8dea96819686cf301c.tar.gz external_llvm-5e41f6569918a6e001cadf8dea96819686cf301c.tar.bz2 |
In order for parameter attribute uniquing to make
any sense it is important that ParamAttr::None gets
treated the same as not supplying an attribute at
all. Rather than stripping ParamAttr::None out of
the list of attributes, assert if ParamAttr::None
is seen. Fix up the bitcode reader which liked to
insert ParamAttr::None all over the place. Patch
based on one by Török Edwin.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@44250 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/VMCore/Function.cpp')
-rw-r--r-- | lib/VMCore/Function.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/VMCore/Function.cpp b/lib/VMCore/Function.cpp index 3256d5b..a011aae 100644 --- a/lib/VMCore/Function.cpp +++ b/lib/VMCore/Function.cpp @@ -129,8 +129,12 @@ ParamAttrsList * ParamAttrsList::get(const ParamAttrsVector &attrVec) { assert(!attrVec.empty() && "Illegal to create empty ParamAttrsList"); #ifndef NDEBUG - for (unsigned i = 1, e = attrVec.size(); i < e; ++i) - assert(attrVec[i-1].index < attrVec[i].index && "Misordered ParamAttrsList!"); + for (unsigned i = 0, e = attrVec.size(); i < e; ++i) { + assert(attrVec[i].attrs != ParamAttr::None + && "Pointless parameter attribute!"); + assert((!i || attrVec[i-1].index < attrVec[i].index) + && "Misordered ParamAttrsList!"); + } #endif ParamAttrsList key(attrVec); FoldingSetNodeID ID; |