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/Constants.h | |
| parent | 65fdded3197461232d8428af7ddd0107e4a9f946 (diff) | |
| download | external_llvm-67c619ba3eae68dcdb3f9340d82b33173aa0c256.tar.gz external_llvm-67c619ba3eae68dcdb3f9340d82b33173aa0c256.tar.bz2 external_llvm-67c619ba3eae68dcdb3f9340d82b33173aa0c256.zip | |
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/Constants.h')
| -rw-r--r-- | include/llvm/Constants.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/include/llvm/Constants.h b/include/llvm/Constants.h index 0fe9358b85..229ef9c76f 100644 --- a/include/llvm/Constants.h +++ b/include/llvm/Constants.h @@ -405,7 +405,8 @@ public: }; template <> -struct OperandTraits<ConstantArray> : public VariadicOperandTraits<> { +struct OperandTraits<ConstantArray> : + public VariadicOperandTraits<ConstantArray> { }; DEFINE_TRANSPARENT_CASTED_OPERAND_ACCESSORS(ConstantArray, Constant) @@ -454,7 +455,8 @@ public: }; template <> -struct OperandTraits<ConstantStruct> : public VariadicOperandTraits<> { +struct OperandTraits<ConstantStruct> : + public VariadicOperandTraits<ConstantStruct> { }; DEFINE_TRANSPARENT_CASTED_OPERAND_ACCESSORS(ConstantStruct, Constant) @@ -511,7 +513,8 @@ public: }; template <> -struct OperandTraits<ConstantVector> : public VariadicOperandTraits<> { +struct OperandTraits<ConstantVector> : + public VariadicOperandTraits<ConstantVector> { }; DEFINE_TRANSPARENT_CASTED_OPERAND_ACCESSORS(ConstantVector, Constant) @@ -592,7 +595,8 @@ public: }; template <> -struct OperandTraits<BlockAddress> : public FixedNumOperandTraits<2> { +struct OperandTraits<BlockAddress> : + public FixedNumOperandTraits<BlockAddress, 2> { }; DEFINE_TRANSPARENT_CASTED_OPERAND_ACCESSORS(BlockAddress, Value) @@ -871,7 +875,8 @@ private: }; template <> -struct OperandTraits<ConstantExpr> : public VariadicOperandTraits<1> { +struct OperandTraits<ConstantExpr> : + public VariadicOperandTraits<ConstantExpr, 1> { }; DEFINE_TRANSPARENT_CASTED_OPERAND_ACCESSORS(ConstantExpr, Constant) |