summaryrefslogtreecommitdiffstats
path: root/unittests/Support/TypeBuilderTest.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'unittests/Support/TypeBuilderTest.cpp')
-rw-r--r--unittests/Support/TypeBuilderTest.cpp281
1 files changed, 147 insertions, 134 deletions
diff --git a/unittests/Support/TypeBuilderTest.cpp b/unittests/Support/TypeBuilderTest.cpp
index 425ee6b..a5c5e67 100644
--- a/unittests/Support/TypeBuilderTest.cpp
+++ b/unittests/Support/TypeBuilderTest.cpp
@@ -8,6 +8,7 @@
//===----------------------------------------------------------------------===//
#include "llvm/Support/TypeBuilder.h"
+#include "llvm/LLVMContext.h"
#include "gtest/gtest.h"
@@ -16,134 +17,146 @@ using namespace llvm;
namespace {
TEST(TypeBuilderTest, Void) {
- EXPECT_EQ(Type::VoidTy, (TypeBuilder<void, true>::get()));
- EXPECT_EQ(Type::VoidTy, (TypeBuilder<void, false>::get()));
+ EXPECT_EQ(Type::getVoidTy(getGlobalContext()), (TypeBuilder<void, true>::get(getGlobalContext())));
+ EXPECT_EQ(Type::getVoidTy(getGlobalContext()), (TypeBuilder<void, false>::get(getGlobalContext())));
// Special case for C compatibility:
- EXPECT_EQ(PointerType::getUnqual(Type::Int8Ty),
- (TypeBuilder<void*, false>::get()));
+ EXPECT_EQ(Type::getInt8PtrTy(getGlobalContext()),
+ (TypeBuilder<void*, false>::get(getGlobalContext())));
}
TEST(TypeBuilderTest, HostIntegers) {
- EXPECT_EQ(Type::Int8Ty, (TypeBuilder<int8_t, false>::get()));
- EXPECT_EQ(Type::Int8Ty, (TypeBuilder<uint8_t, false>::get()));
- EXPECT_EQ(Type::Int16Ty, (TypeBuilder<int16_t, false>::get()));
- EXPECT_EQ(Type::Int16Ty, (TypeBuilder<uint16_t, false>::get()));
- EXPECT_EQ(Type::Int32Ty, (TypeBuilder<int32_t, false>::get()));
- EXPECT_EQ(Type::Int32Ty, (TypeBuilder<uint32_t, false>::get()));
- EXPECT_EQ(Type::Int64Ty, (TypeBuilder<int64_t, false>::get()));
- EXPECT_EQ(Type::Int64Ty, (TypeBuilder<uint64_t, false>::get()));
-
- EXPECT_EQ(IntegerType::get(sizeof(size_t) * CHAR_BIT),
- (TypeBuilder<size_t, false>::get()));
- EXPECT_EQ(IntegerType::get(sizeof(ptrdiff_t) * CHAR_BIT),
- (TypeBuilder<ptrdiff_t, false>::get()));
+ EXPECT_EQ(Type::getInt8Ty(getGlobalContext()), (TypeBuilder<int8_t, false>::get(getGlobalContext())));
+ EXPECT_EQ(Type::getInt8Ty(getGlobalContext()), (TypeBuilder<uint8_t, false>::get(getGlobalContext())));
+ EXPECT_EQ(Type::getInt16Ty(getGlobalContext()), (TypeBuilder<int16_t, false>::get(getGlobalContext())));
+ EXPECT_EQ(Type::getInt16Ty(getGlobalContext()), (TypeBuilder<uint16_t, false>::get(getGlobalContext())));
+ EXPECT_EQ(Type::getInt32Ty(getGlobalContext()), (TypeBuilder<int32_t, false>::get(getGlobalContext())));
+ EXPECT_EQ(Type::getInt32Ty(getGlobalContext()), (TypeBuilder<uint32_t, false>::get(getGlobalContext())));
+ EXPECT_EQ(Type::getInt64Ty(getGlobalContext()), (TypeBuilder<int64_t, false>::get(getGlobalContext())));
+ EXPECT_EQ(Type::getInt64Ty(getGlobalContext()), (TypeBuilder<uint64_t, false>::get(getGlobalContext())));
+
+ EXPECT_EQ(IntegerType::get(getGlobalContext(), sizeof(size_t) * CHAR_BIT),
+ (TypeBuilder<size_t, false>::get(getGlobalContext())));
+ EXPECT_EQ(IntegerType::get(getGlobalContext(), sizeof(ptrdiff_t) * CHAR_BIT),
+ (TypeBuilder<ptrdiff_t, false>::get(getGlobalContext())));
}
TEST(TypeBuilderTest, CrossCompilableIntegers) {
- EXPECT_EQ(IntegerType::get(1), (TypeBuilder<types::i<1>, true>::get()));
- EXPECT_EQ(IntegerType::get(1), (TypeBuilder<types::i<1>, false>::get()));
- EXPECT_EQ(IntegerType::get(72), (TypeBuilder<types::i<72>, true>::get()));
- EXPECT_EQ(IntegerType::get(72), (TypeBuilder<types::i<72>, false>::get()));
+ EXPECT_EQ(IntegerType::get(getGlobalContext(), 1), (TypeBuilder<types::i<1>, true>::get(getGlobalContext())));
+ EXPECT_EQ(IntegerType::get(getGlobalContext(), 1), (TypeBuilder<types::i<1>, false>::get(getGlobalContext())));
+ EXPECT_EQ(IntegerType::get(getGlobalContext(), 72), (TypeBuilder<types::i<72>, true>::get(getGlobalContext())));
+ EXPECT_EQ(IntegerType::get(getGlobalContext(), 72), (TypeBuilder<types::i<72>, false>::get(getGlobalContext())));
}
TEST(TypeBuilderTest, Float) {
- EXPECT_EQ(Type::FloatTy, (TypeBuilder<float, false>::get()));
- EXPECT_EQ(Type::DoubleTy, (TypeBuilder<double, false>::get()));
+ EXPECT_EQ(Type::getFloatTy(getGlobalContext()), (TypeBuilder<float, false>::get(getGlobalContext())));
+ EXPECT_EQ(Type::getDoubleTy(getGlobalContext()), (TypeBuilder<double, false>::get(getGlobalContext())));
// long double isn't supported yet.
- EXPECT_EQ(Type::FloatTy, (TypeBuilder<types::ieee_float, true>::get()));
- EXPECT_EQ(Type::FloatTy, (TypeBuilder<types::ieee_float, false>::get()));
- EXPECT_EQ(Type::DoubleTy, (TypeBuilder<types::ieee_double, true>::get()));
- EXPECT_EQ(Type::DoubleTy, (TypeBuilder<types::ieee_double, false>::get()));
- EXPECT_EQ(Type::X86_FP80Ty, (TypeBuilder<types::x86_fp80, true>::get()));
- EXPECT_EQ(Type::X86_FP80Ty, (TypeBuilder<types::x86_fp80, false>::get()));
- EXPECT_EQ(Type::FP128Ty, (TypeBuilder<types::fp128, true>::get()));
- EXPECT_EQ(Type::FP128Ty, (TypeBuilder<types::fp128, false>::get()));
- EXPECT_EQ(Type::PPC_FP128Ty, (TypeBuilder<types::ppc_fp128, true>::get()));
- EXPECT_EQ(Type::PPC_FP128Ty, (TypeBuilder<types::ppc_fp128, false>::get()));
+ EXPECT_EQ(Type::getFloatTy(getGlobalContext()), (TypeBuilder<types::ieee_float, true>::get(getGlobalContext())));
+ EXPECT_EQ(Type::getFloatTy(getGlobalContext()), (TypeBuilder<types::ieee_float, false>::get(getGlobalContext())));
+ EXPECT_EQ(Type::getDoubleTy(getGlobalContext()), (TypeBuilder<types::ieee_double, true>::get(getGlobalContext())));
+ EXPECT_EQ(Type::getDoubleTy(getGlobalContext()), (TypeBuilder<types::ieee_double, false>::get(getGlobalContext())));
+ EXPECT_EQ(Type::getX86_FP80Ty(getGlobalContext()), (TypeBuilder<types::x86_fp80, true>::get(getGlobalContext())));
+ EXPECT_EQ(Type::getX86_FP80Ty(getGlobalContext()), (TypeBuilder<types::x86_fp80, false>::get(getGlobalContext())));
+ EXPECT_EQ(Type::getFP128Ty(getGlobalContext()), (TypeBuilder<types::fp128, true>::get(getGlobalContext())));
+ EXPECT_EQ(Type::getFP128Ty(getGlobalContext()), (TypeBuilder<types::fp128, false>::get(getGlobalContext())));
+ EXPECT_EQ(Type::getPPC_FP128Ty(getGlobalContext()), (TypeBuilder<types::ppc_fp128, true>::get(getGlobalContext())));
+ EXPECT_EQ(Type::getPPC_FP128Ty(getGlobalContext()), (TypeBuilder<types::ppc_fp128, false>::get(getGlobalContext())));
}
TEST(TypeBuilderTest, Derived) {
- EXPECT_EQ(PointerType::getUnqual(PointerType::getUnqual(Type::Int8Ty)),
- (TypeBuilder<int8_t**, false>::get()));
- EXPECT_EQ(ArrayType::get(Type::Int8Ty, 7),
- (TypeBuilder<int8_t[7], false>::get()));
- EXPECT_EQ(ArrayType::get(Type::Int8Ty, 0),
- (TypeBuilder<int8_t[], false>::get()));
-
- EXPECT_EQ(PointerType::getUnqual(PointerType::getUnqual(Type::Int8Ty)),
- (TypeBuilder<types::i<8>**, false>::get()));
- EXPECT_EQ(ArrayType::get(Type::Int8Ty, 7),
- (TypeBuilder<types::i<8>[7], false>::get()));
- EXPECT_EQ(ArrayType::get(Type::Int8Ty, 0),
- (TypeBuilder<types::i<8>[], false>::get()));
-
- EXPECT_EQ(PointerType::getUnqual(PointerType::getUnqual(Type::Int8Ty)),
- (TypeBuilder<types::i<8>**, true>::get()));
- EXPECT_EQ(ArrayType::get(Type::Int8Ty, 7),
- (TypeBuilder<types::i<8>[7], true>::get()));
- EXPECT_EQ(ArrayType::get(Type::Int8Ty, 0),
- (TypeBuilder<types::i<8>[], true>::get()));
-
-
- EXPECT_EQ(Type::Int8Ty,
- (TypeBuilder<const int8_t, false>::get()));
- EXPECT_EQ(Type::Int8Ty,
- (TypeBuilder<volatile int8_t, false>::get()));
- EXPECT_EQ(Type::Int8Ty,
- (TypeBuilder<const volatile int8_t, false>::get()));
-
- EXPECT_EQ(Type::Int8Ty,
- (TypeBuilder<const types::i<8>, false>::get()));
- EXPECT_EQ(Type::Int8Ty,
- (TypeBuilder<volatile types::i<8>, false>::get()));
- EXPECT_EQ(Type::Int8Ty,
- (TypeBuilder<const volatile types::i<8>, false>::get()));
-
- EXPECT_EQ(Type::Int8Ty,
- (TypeBuilder<const types::i<8>, true>::get()));
- EXPECT_EQ(Type::Int8Ty,
- (TypeBuilder<volatile types::i<8>, true>::get()));
- EXPECT_EQ(Type::Int8Ty,
- (TypeBuilder<const volatile types::i<8>, true>::get()));
-
- EXPECT_EQ(PointerType::getUnqual(Type::Int8Ty),
- (TypeBuilder<const volatile int8_t*const volatile, false>::get()));
+ EXPECT_EQ(PointerType::getUnqual(Type::getInt8PtrTy(getGlobalContext())),
+ (TypeBuilder<int8_t**, false>::get(getGlobalContext())));
+ EXPECT_EQ(ArrayType::get(Type::getInt8Ty(getGlobalContext()), 7),
+ (TypeBuilder<int8_t[7], false>::get(getGlobalContext())));
+ EXPECT_EQ(ArrayType::get(Type::getInt8Ty(getGlobalContext()), 0),
+ (TypeBuilder<int8_t[], false>::get(getGlobalContext())));
+
+ EXPECT_EQ(PointerType::getUnqual(Type::getInt8PtrTy(getGlobalContext())),
+ (TypeBuilder<types::i<8>**, false>::get(getGlobalContext())));
+ EXPECT_EQ(ArrayType::get(Type::getInt8Ty(getGlobalContext()), 7),
+ (TypeBuilder<types::i<8>[7], false>::get(getGlobalContext())));
+ EXPECT_EQ(ArrayType::get(Type::getInt8Ty(getGlobalContext()), 0),
+ (TypeBuilder<types::i<8>[], false>::get(getGlobalContext())));
+
+ EXPECT_EQ(PointerType::getUnqual(Type::getInt8PtrTy(getGlobalContext())),
+ (TypeBuilder<types::i<8>**, true>::get(getGlobalContext())));
+ EXPECT_EQ(ArrayType::get(Type::getInt8Ty(getGlobalContext()), 7),
+ (TypeBuilder<types::i<8>[7], true>::get(getGlobalContext())));
+ EXPECT_EQ(ArrayType::get(Type::getInt8Ty(getGlobalContext()), 0),
+ (TypeBuilder<types::i<8>[], true>::get(getGlobalContext())));
+
+
+ EXPECT_EQ(Type::getInt8Ty(getGlobalContext()),
+ (TypeBuilder<const int8_t, false>::get(getGlobalContext())));
+ EXPECT_EQ(Type::getInt8Ty(getGlobalContext()),
+ (TypeBuilder<volatile int8_t, false>::get(getGlobalContext())));
+ EXPECT_EQ(Type::getInt8Ty(getGlobalContext()),
+ (TypeBuilder<const volatile int8_t, false>::get(getGlobalContext())));
+
+ EXPECT_EQ(Type::getInt8Ty(getGlobalContext()),
+ (TypeBuilder<const types::i<8>, false>::get(getGlobalContext())));
+ EXPECT_EQ(Type::getInt8Ty(getGlobalContext()),
+ (TypeBuilder<volatile types::i<8>, false>::get(getGlobalContext())));
+ EXPECT_EQ(Type::getInt8Ty(getGlobalContext()),
+ (TypeBuilder<const volatile types::i<8>, false>::get(getGlobalContext())));
+
+ EXPECT_EQ(Type::getInt8Ty(getGlobalContext()),
+ (TypeBuilder<const types::i<8>, true>::get(getGlobalContext())));
+ EXPECT_EQ(Type::getInt8Ty(getGlobalContext()),
+ (TypeBuilder<volatile types::i<8>, true>::get(getGlobalContext())));
+ EXPECT_EQ(Type::getInt8Ty(getGlobalContext()),
+ (TypeBuilder<const volatile types::i<8>, true>::get(getGlobalContext())));
+
+ EXPECT_EQ(Type::getInt8PtrTy(getGlobalContext()),
+ (TypeBuilder<const volatile int8_t*const volatile, false>::get(getGlobalContext())));
}
TEST(TypeBuilderTest, Functions) {
std::vector<const Type*> params;
- EXPECT_EQ(FunctionType::get(Type::VoidTy, params, false),
- (TypeBuilder<void(), true>::get()));
- EXPECT_EQ(FunctionType::get(Type::Int8Ty, params, true),
- (TypeBuilder<int8_t(...), false>::get()));
- params.push_back(TypeBuilder<int32_t*, false>::get());
- EXPECT_EQ(FunctionType::get(Type::Int8Ty, params, false),
- (TypeBuilder<int8_t(const int32_t*), false>::get()));
- EXPECT_EQ(FunctionType::get(Type::Int8Ty, params, true),
- (TypeBuilder<int8_t(const int32_t*, ...), false>::get()));
- params.push_back(TypeBuilder<char*, false>::get());
- EXPECT_EQ(FunctionType::get(Type::Int8Ty, params, false),
- (TypeBuilder<int8_t(int32_t*, void*), false>::get()));
- EXPECT_EQ(FunctionType::get(Type::Int8Ty, params, true),
- (TypeBuilder<int8_t(int32_t*, char*, ...), false>::get()));
- params.push_back(TypeBuilder<char, false>::get());
- EXPECT_EQ(FunctionType::get(Type::Int8Ty, params, false),
- (TypeBuilder<int8_t(int32_t*, void*, char), false>::get()));
- EXPECT_EQ(FunctionType::get(Type::Int8Ty, params, true),
- (TypeBuilder<int8_t(int32_t*, char*, char, ...), false>::get()));
- params.push_back(TypeBuilder<char, false>::get());
- EXPECT_EQ(FunctionType::get(Type::Int8Ty, params, false),
- (TypeBuilder<int8_t(int32_t*, void*, char, char), false>::get()));
- EXPECT_EQ(FunctionType::get(Type::Int8Ty, params, true),
+ EXPECT_EQ(FunctionType::get(Type::getVoidTy(getGlobalContext()), params, false),
+ (TypeBuilder<void(), true>::get(getGlobalContext())));
+ EXPECT_EQ(FunctionType::get(Type::getInt8Ty(getGlobalContext()), params, true),
+ (TypeBuilder<int8_t(...), false>::get(getGlobalContext())));
+ params.push_back(TypeBuilder<int32_t*, false>::get(getGlobalContext()));
+ EXPECT_EQ(FunctionType::get(Type::getInt8Ty(getGlobalContext()), params, false),
+ (TypeBuilder<int8_t(const int32_t*), false>::get(getGlobalContext())));
+ EXPECT_EQ(FunctionType::get(Type::getInt8Ty(getGlobalContext()), params, true),
+ (TypeBuilder<int8_t(const int32_t*, ...), false>::get(getGlobalContext())));
+ params.push_back(TypeBuilder<char*, false>::get(getGlobalContext()));
+ EXPECT_EQ(FunctionType::get(Type::getInt8Ty(getGlobalContext()), params, false),
+ (TypeBuilder<int8_t(int32_t*, void*), false>::get(getGlobalContext())));
+ EXPECT_EQ(FunctionType::get(Type::getInt8Ty(getGlobalContext()), params, true),
+ (TypeBuilder<int8_t(int32_t*, char*, ...), false>::get(getGlobalContext())));
+ params.push_back(TypeBuilder<char, false>::get(getGlobalContext()));
+ EXPECT_EQ(FunctionType::get(Type::getInt8Ty(getGlobalContext()), params, false),
+ (TypeBuilder<int8_t(int32_t*, void*, char), false>::get(getGlobalContext())));
+ EXPECT_EQ(FunctionType::get(Type::getInt8Ty(getGlobalContext()), params, true),
+ (TypeBuilder<int8_t(int32_t*, char*, char, ...), false>::get(getGlobalContext())));
+ params.push_back(TypeBuilder<char, false>::get(getGlobalContext()));
+ EXPECT_EQ(FunctionType::get(Type::getInt8Ty(getGlobalContext()), params, false),
+ (TypeBuilder<int8_t(int32_t*, void*, char, char), false>::get(getGlobalContext())));
+ EXPECT_EQ(FunctionType::get(Type::getInt8Ty(getGlobalContext()), params, true),
(TypeBuilder<int8_t(int32_t*, char*, char, char, ...),
- false>::get()));
- params.push_back(TypeBuilder<char, false>::get());
- EXPECT_EQ(FunctionType::get(Type::Int8Ty, params, false),
+ false>::get(getGlobalContext())));
+ params.push_back(TypeBuilder<char, false>::get(getGlobalContext()));
+ EXPECT_EQ(FunctionType::get(Type::getInt8Ty(getGlobalContext()), params, false),
(TypeBuilder<int8_t(int32_t*, void*, char, char, char),
- false>::get()));
- EXPECT_EQ(FunctionType::get(Type::Int8Ty, params, true),
+ false>::get(getGlobalContext())));
+ EXPECT_EQ(FunctionType::get(Type::getInt8Ty(getGlobalContext()), params, true),
(TypeBuilder<int8_t(int32_t*, char*, char, char, char, ...),
- false>::get()));
+ false>::get(getGlobalContext())));
+}
+
+TEST(TypeBuilderTest, Context) {
+ // We used to cache TypeBuilder results in static local variables. This
+ // produced the same type for different contexts, which of course broke
+ // things.
+ LLVMContext context1;
+ EXPECT_EQ(&context1,
+ &(TypeBuilder<types::i<1>, true>::get(context1))->getContext());
+ LLVMContext context2;
+ EXPECT_EQ(&context2,
+ &(TypeBuilder<types::i<1>, true>::get(context2))->getContext());
}
class MyType {
@@ -163,14 +176,14 @@ class MyPortableType {
namespace llvm {
template<bool cross> class TypeBuilder<MyType, cross> {
public:
- static const StructType *get() {
+ static const StructType *get(LLVMContext &Context) {
// Using the static result variable ensures that the type is
// only looked up once.
- static const StructType *const result = StructType::get(
- TypeBuilder<int, cross>::get(),
- TypeBuilder<int*, cross>::get(),
- TypeBuilder<void*[], cross>::get(),
- NULL);
+ std::vector<const Type*> st;
+ st.push_back(TypeBuilder<int, cross>::get(Context));
+ st.push_back(TypeBuilder<int*, cross>::get(Context));
+ st.push_back(TypeBuilder<void*[], cross>::get(Context));
+ static const StructType *const result = StructType::get(Context, st);
return result;
}
@@ -186,14 +199,14 @@ public:
template<bool cross> class TypeBuilder<MyPortableType, cross> {
public:
- static const StructType *get() {
+ static const StructType *get(LLVMContext &Context) {
// Using the static result variable ensures that the type is
// only looked up once.
- static const StructType *const result = StructType::get(
- TypeBuilder<types::i<32>, cross>::get(),
- TypeBuilder<types::i<32>*, cross>::get(),
- TypeBuilder<types::i<8>*[], cross>::get(),
- NULL);
+ std::vector<const Type*> st;
+ st.push_back(TypeBuilder<types::i<32>, cross>::get(Context));
+ st.push_back(TypeBuilder<types::i<32>*, cross>::get(Context));
+ st.push_back(TypeBuilder<types::i<8>*[], cross>::get(Context));
+ static const StructType *const result = StructType::get(Context, st);
return result;
}
@@ -210,24 +223,24 @@ public:
namespace {
TEST(TypeBuilderTest, Extensions) {
- EXPECT_EQ(PointerType::getUnqual(StructType::get(
- TypeBuilder<int, false>::get(),
- TypeBuilder<int*, false>::get(),
- TypeBuilder<void*[], false>::get(),
+ EXPECT_EQ(PointerType::getUnqual(StructType::get(getGlobalContext(),
+ TypeBuilder<int, false>::get(getGlobalContext()),
+ TypeBuilder<int*, false>::get(getGlobalContext()),
+ TypeBuilder<void*[], false>::get(getGlobalContext()),
NULL)),
- (TypeBuilder<MyType*, false>::get()));
- EXPECT_EQ(PointerType::getUnqual(StructType::get(
- TypeBuilder<types::i<32>, false>::get(),
- TypeBuilder<types::i<32>*, false>::get(),
- TypeBuilder<types::i<8>*[], false>::get(),
+ (TypeBuilder<MyType*, false>::get(getGlobalContext())));
+ EXPECT_EQ(PointerType::getUnqual(StructType::get(getGlobalContext(),
+ TypeBuilder<types::i<32>, false>::get(getGlobalContext()),
+ TypeBuilder<types::i<32>*, false>::get(getGlobalContext()),
+ TypeBuilder<types::i<8>*[], false>::get(getGlobalContext()),
NULL)),
- (TypeBuilder<MyPortableType*, false>::get()));
- EXPECT_EQ(PointerType::getUnqual(StructType::get(
- TypeBuilder<types::i<32>, false>::get(),
- TypeBuilder<types::i<32>*, false>::get(),
- TypeBuilder<types::i<8>*[], false>::get(),
+ (TypeBuilder<MyPortableType*, false>::get(getGlobalContext())));
+ EXPECT_EQ(PointerType::getUnqual(StructType::get(getGlobalContext(),
+ TypeBuilder<types::i<32>, false>::get(getGlobalContext()),
+ TypeBuilder<types::i<32>*, false>::get(getGlobalContext()),
+ TypeBuilder<types::i<8>*[], false>::get(getGlobalContext()),
NULL)),
- (TypeBuilder<MyPortableType*, true>::get()));
+ (TypeBuilder<MyPortableType*, true>::get(getGlobalContext())));
}
} // anonymous namespace
OpenPOWER on IntegriCloud