diff options
| author | Jay Foad <jay.foad@gmail.com> | 2011-01-11 15:07:38 +0000 |
|---|---|---|
| committer | Jay Foad <jay.foad@gmail.com> | 2011-01-11 15:07:38 +0000 |
| commit | 67c619ba3eae68dcdb3f9340d82b33173aa0c256 (patch) | |
| tree | 3c0745fca275d5e4e31f1da2a5a84553fe69bd4a /include/llvm/InstrTypes.h | |
| parent | 65fdded3197461232d8428af7ddd0107e4a9f946 (diff) | |
| download | external_llvm-67c619ba3eae68dcdb3f9340d82b33173aa0c256.zip external_llvm-67c619ba3eae68dcdb3f9340d82b33173aa0c256.tar.gz external_llvm-67c619ba3eae68dcdb3f9340d82b33173aa0c256.tar.bz2 | |
FixedNumOperandTraits and VariadicOperandTraits assumed that, given a
"this" pointer for any subclass of User, you could static_cast it to
User* and then reinterpret_cast that to Use* to get the end of the
operand list. This isn't a safe assumption in general, because the
static_cast might adjust the "this" pointer. Fixed by having these
OperandTraits classes take an extra template parameter, which is the
subclass of User. This is groundwork for PR889.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@123235 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/llvm/InstrTypes.h')
| -rw-r--r-- | include/llvm/InstrTypes.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/llvm/InstrTypes.h b/include/llvm/InstrTypes.h index 25b63a5..9dcf688 100644 --- a/include/llvm/InstrTypes.h +++ b/include/llvm/InstrTypes.h @@ -128,7 +128,8 @@ public: }; template <> -struct OperandTraits<UnaryInstruction> : public FixedNumOperandTraits<1> { +struct OperandTraits<UnaryInstruction> : + public FixedNumOperandTraits<UnaryInstruction, 1> { }; DEFINE_TRANSPARENT_OPERAND_ACCESSORS(UnaryInstruction, Value) @@ -432,7 +433,8 @@ public: }; template <> -struct OperandTraits<BinaryOperator> : public FixedNumOperandTraits<2> { +struct OperandTraits<BinaryOperator> : + public FixedNumOperandTraits<BinaryOperator, 2> { }; DEFINE_TRANSPARENT_OPERAND_ACCESSORS(BinaryOperator, Value) @@ -903,7 +905,7 @@ private: // FIXME: these are redundant if CmpInst < BinaryOperator template <> -struct OperandTraits<CmpInst> : public FixedNumOperandTraits<2> { +struct OperandTraits<CmpInst> : public FixedNumOperandTraits<CmpInst, 2> { }; DEFINE_TRANSPARENT_OPERAND_ACCESSORS(CmpInst, Value) |