diff options
| author | Talin <viridia@gmail.com> | 2011-02-28 23:53:27 +0000 |
|---|---|---|
| committer | Talin <viridia@gmail.com> | 2011-02-28 23:53:27 +0000 |
| commit | 41ee4e57ea0f2afb89fd136065edb03f32f972d3 (patch) | |
| tree | 7304eb481e41ff537f2fdfd22c38d0bbbcb3c03b | |
| parent | e7200684b08379c7018a9546c8f1e874215db741 (diff) | |
Add an END_WITH_NULL accessor for ConstantStruct.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@126714 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/llvm/Constants.h | 2 | ||||
| -rw-r--r-- | lib/VMCore/Constants.cpp | 15 |
2 files changed, 15 insertions, 2 deletions
diff --git a/include/llvm/Constants.h b/include/llvm/Constants.h index c4768f8423..4ca22984b6 100644 --- a/include/llvm/Constants.h +++ b/include/llvm/Constants.h @@ -425,6 +425,8 @@ public: const std::vector<Constant*> &V, bool Packed); static Constant *get(LLVMContext &Context, Constant *const *Vals, unsigned NumVals, bool Packed); + static Constant *get(LLVMContext &Context, bool Packed, + Constant * Val, ...) END_WITH_NULL; /// Transparently provide more efficient getOperand methods. DECLARE_TRANSPARENT_OPERAND_ACCESSORS(Constant); diff --git a/lib/VMCore/Constants.cpp b/lib/VMCore/Constants.cpp index 246fde1569..5468a4f1b4 100644 --- a/lib/VMCore/Constants.cpp +++ b/lib/VMCore/Constants.cpp @@ -33,6 +33,7 @@ #include "llvm/ADT/SmallVector.h" #include <algorithm> #include <map> +#include <cstdarg> using namespace llvm; //===----------------------------------------------------------------------===// @@ -596,8 +597,6 @@ Constant *ConstantArray::get(LLVMContext &Context, StringRef Str, return get(ATy, ElementVals); } - - ConstantStruct::ConstantStruct(const StructType *T, const std::vector<Constant*> &V) : Constant(T, ConstantStructVal, @@ -644,6 +643,18 @@ Constant *ConstantStruct::get(LLVMContext &Context, return get(Context, std::vector<Constant*>(Vals, Vals+NumVals), Packed); } +Constant* ConstantStruct::get(LLVMContext &Context, bool Packed, + Constant * Val, ...) { + va_list ap; + std::vector<Constant*> Values; + va_start(ap, Val); + while (Val) { + Values.push_back(Val); + Val = va_arg(ap, llvm::Constant*); + } + return get(Context, Values, Packed); +} + ConstantVector::ConstantVector(const VectorType *T, const std::vector<Constant*> &V) : Constant(T, ConstantVectorVal, |