From a56474081c8414a211cefa64a8ea8ffb896504b8 Mon Sep 17 00:00:00 2001 From: James Y Knight Date: Sun, 13 Jan 2019 16:09:28 +0000 Subject: [PATCH] Remove TypeBuilder.h, and fix the few locations using it. This shortcut mechanism for creating types was added 10 years ago, but has seen almost no uptake since then, neither internally nor in external projects. The very small number of characters saved by using it does not seem worth the mental overhead of an additional type-creation API, so, delete it. Differential Revision: https://reviews.llvm.org/D56573 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@351020 91177308-0d34-0410-b5e6-96231b3b80d8 --- docs/ExtendingLLVM.rst | 8 - docs/ProgrammersManual.rst | 31 -- include/llvm/IR/TypeBuilder.h | 407 ------------------ tools/lli/lli.cpp | 26 +- .../MCJIT/MCJITMultipleModuleTest.cpp | 9 +- unittests/ExecutionEngine/MCJIT/MCJITTest.cpp | 44 +- .../ExecutionEngine/MCJIT/MCJITTestBase.h | 60 ++- .../Orc/IndirectionUtilsTest.cpp | 5 +- .../LegacyRTDyldObjectLinkingLayerTest.cpp | 19 +- unittests/ExecutionEngine/Orc/OrcCAPITest.cpp | 11 +- unittests/ExecutionEngine/Orc/OrcTestCommon.h | 20 +- .../Orc/RTDyldObjectLinkingLayerTest.cpp | 18 +- .../Orc/RemoteObjectLayerTest.cpp | 7 +- unittests/IR/CFGBuilder.cpp | 3 +- unittests/IR/CMakeLists.txt | 1 - unittests/IR/TypeBuilderTest.cpp | 284 ------------ utils/gn/secondary/llvm/unittests/IR/BUILD.gn | 1 - 17 files changed, 123 insertions(+), 831 deletions(-) delete mode 100644 include/llvm/IR/TypeBuilder.h delete mode 100644 unittests/IR/TypeBuilderTest.cpp diff --git a/docs/ExtendingLLVM.rst b/docs/ExtendingLLVM.rst index 87f48c99342..389dfad168b 100644 --- a/docs/ExtendingLLVM.rst +++ b/docs/ExtendingLLVM.rst @@ -253,10 +253,6 @@ Adding a fundamental type add enum ``LLVMTypeKind`` and modify ``LLVMTypeKind LLVMGetTypeKind(LLVMTypeRef Ty)`` for the new type -#. ``llvm/include/llvm/IR/TypeBuilder.h``: - - add new class to represent new type in the hierarchy - #. ``llvm/lib/AsmParser/LLLexer.cpp``: add ability to parse in the type from text assembly @@ -299,10 +295,6 @@ Adding a derived type add enum ``LLVMTypeKind`` and modify `LLVMTypeKind LLVMGetTypeKind(LLVMTypeRef Ty)` for the new type -#. ``llvm/include/llvm/IR/TypeBuilder.h``: - - add new class to represent new class in the hierarchy - #. ``llvm/lib/AsmParser/LLLexer.cpp``: modify ``lltok::Kind LLLexer::LexIdentifier()`` to add ability to diff --git a/docs/ProgrammersManual.rst b/docs/ProgrammersManual.rst index 88c56700eb3..0903a22fc3e 100644 --- a/docs/ProgrammersManual.rst +++ b/docs/ProgrammersManual.rst @@ -2905,37 +2905,6 @@ For example: GV->eraseFromParent(); -.. _create_types: - -How to Create Types -------------------- - -In generating IR, you may need some complex types. If you know these types -statically, you can use ``TypeBuilder<...>::get()``, defined in -``llvm/Support/TypeBuilder.h``, to retrieve them. ``TypeBuilder`` has two forms -depending on whether you're building types for cross-compilation or native -library use. ``TypeBuilder`` requires that ``T`` be independent of the -host environment, meaning that it's built out of types from the ``llvm::types`` -(`doxygen `__) namespace -and pointers, functions, arrays, etc. built of those. ``TypeBuilder`` -additionally allows native C types whose size may depend on the host compiler. -For example, - -.. code-block:: c++ - - FunctionType *ft = TypeBuilder(types::i<32>*), true>::get(); - -is easier to read and write than the equivalent - -.. code-block:: c++ - - std::vector params; - params.push_back(PointerType::getUnqual(Type::Int32Ty)); - FunctionType *ft = FunctionType::get(Type::Int8Ty, params, false); - -See the `class comment -`_ for more details. - .. _threading: Threads and LLVM diff --git a/include/llvm/IR/TypeBuilder.h b/include/llvm/IR/TypeBuilder.h deleted file mode 100644 index d2c6f00079d..00000000000 --- a/include/llvm/IR/TypeBuilder.h +++ /dev/null @@ -1,407 +0,0 @@ -//===---- llvm/TypeBuilder.h - Builder for LLVM types -----------*- C++ -*-===// -// -// The LLVM Compiler Infrastructure -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// -// -// This file defines the TypeBuilder class, which is used as a convenient way to -// create LLVM types with a consistent and simplified interface. -// -//===----------------------------------------------------------------------===// - -#ifndef LLVM_IR_TYPEBUILDER_H -#define LLVM_IR_TYPEBUILDER_H - -#include "llvm/IR/DerivedTypes.h" -#include "llvm/IR/LLVMContext.h" -#include - -namespace llvm { - -/// TypeBuilder - This provides a uniform API for looking up types -/// known at compile time. To support cross-compilation, we define a -/// series of tag types in the llvm::types namespace, like i, -/// ieee_float, ppc_fp128, etc. TypeBuilder allows T to be -/// any of these, a native C type (whose size may depend on the host -/// compiler), or a pointer, function, or struct type built out of -/// these. TypeBuilder removes native C types from this set -/// to guarantee that its result is suitable for cross-compilation. -/// We define the primitive types, pointer types, and functions up to -/// 5 arguments here, but to use this class with your own types, -/// you'll need to specialize it. For example, say you want to call a -/// function defined externally as: -/// -/// \code{.cpp} -/// -/// struct MyType { -/// int32 a; -/// int32 *b; -/// void *array[1]; // Intended as a flexible array. -/// }; -/// int8 AFunction(struct MyType *value); -/// -/// \endcode -/// -/// You'll want to use -/// Function::Create(TypeBuilder(MyType*), true>::get(), ...) -/// to declare the function, but when you first try this, your compiler will -/// complain that TypeBuilder::get() doesn't exist. To fix this, -/// write: -/// -/// \code{.cpp} -/// -/// namespace llvm { -/// template class TypeBuilder { -/// public: -/// static StructType *get(LLVMContext &Context) { -/// // If you cache this result, be sure to cache it separately -/// // for each LLVMContext. -/// return StructType::get( -/// TypeBuilder, xcompile>::get(Context), -/// TypeBuilder*, xcompile>::get(Context), -/// TypeBuilder*[], xcompile>::get(Context), -/// nullptr); -/// } -/// -/// // You may find this a convenient place to put some constants -/// // to help with getelementptr. They don't have any effect on -/// // the operation of TypeBuilder. -/// enum Fields { -/// FIELD_A, -/// FIELD_B, -/// FIELD_ARRAY -/// }; -/// } -/// } // namespace llvm -/// -/// \endcode -/// -/// TypeBuilder cannot handle recursive types or types you only know at runtime. -/// If you try to give it a recursive type, it will deadlock, infinitely -/// recurse, or do something similarly undesirable. -template class TypeBuilder {}; - -// Types for use with cross-compilable TypeBuilders. These correspond -// exactly with an LLVM-native type. -namespace types { -/// i corresponds to the LLVM IntegerType with N bits. -template class i {}; - -// The following classes represent the LLVM floating types. -class ieee_float {}; -class ieee_double {}; -class x86_fp80 {}; -class fp128 {}; -class ppc_fp128 {}; -// X86 MMX. -class x86_mmx {}; -} // namespace types - -// LLVM doesn't have const or volatile types. -template class TypeBuilder - : public TypeBuilder {}; -template class TypeBuilder - : public TypeBuilder {}; -template class TypeBuilder - : public TypeBuilder {}; - -// Pointers -template class TypeBuilder { -public: - static PointerType *get(LLVMContext &Context) { - return PointerType::getUnqual(TypeBuilder::get(Context)); - } -}; - -/// There is no support for references -template class TypeBuilder {}; - -// Arrays -template class TypeBuilder { -public: - static ArrayType *get(LLVMContext &Context) { - return ArrayType::get(TypeBuilder::get(Context), N); - } -}; -/// LLVM uses an array of length 0 to represent an unknown-length array. -template class TypeBuilder { -public: - static ArrayType *get(LLVMContext &Context) { - return ArrayType::get(TypeBuilder::get(Context), 0); - } -}; - -// Define the C integral types only for TypeBuilder. -// -// C integral types do not have a defined size. It would be nice to use the -// stdint.h-defined typedefs that do have defined sizes, but we'd run into the -// following problem: -// -// On an ILP32 machine, stdint.h might define: -// -// typedef int int32_t; -// typedef long long int64_t; -// typedef long size_t; -// -// If we defined TypeBuilder and TypeBuilder, then any use of -// TypeBuilder would fail. We couldn't define TypeBuilder in -// addition to the defined-size types because we'd get duplicate definitions on -// platforms where stdint.h instead defines: -// -// typedef int int32_t; -// typedef long long int64_t; -// typedef int size_t; -// -// So we define all the primitive C types and nothing else. -#define DEFINE_INTEGRAL_TYPEBUILDER(T) \ -template<> class TypeBuilder { \ -public: \ - static IntegerType *get(LLVMContext &Context) { \ - return IntegerType::get(Context, sizeof(T) * CHAR_BIT); \ - } \ -}; \ -template<> class TypeBuilder { \ - /* We provide a definition here so users don't accidentally */ \ - /* define these types to work. */ \ -} -DEFINE_INTEGRAL_TYPEBUILDER(char); -DEFINE_INTEGRAL_TYPEBUILDER(signed char); -DEFINE_INTEGRAL_TYPEBUILDER(unsigned char); -DEFINE_INTEGRAL_TYPEBUILDER(short); -DEFINE_INTEGRAL_TYPEBUILDER(unsigned short); -DEFINE_INTEGRAL_TYPEBUILDER(int); -DEFINE_INTEGRAL_TYPEBUILDER(unsigned int); -DEFINE_INTEGRAL_TYPEBUILDER(long); -DEFINE_INTEGRAL_TYPEBUILDER(unsigned long); -#ifdef _MSC_VER -DEFINE_INTEGRAL_TYPEBUILDER(__int64); -DEFINE_INTEGRAL_TYPEBUILDER(unsigned __int64); -#else /* _MSC_VER */ -DEFINE_INTEGRAL_TYPEBUILDER(long long); -DEFINE_INTEGRAL_TYPEBUILDER(unsigned long long); -#endif /* _MSC_VER */ -#undef DEFINE_INTEGRAL_TYPEBUILDER - -template -class TypeBuilder, cross> { -public: - static IntegerType *get(LLVMContext &C) { - return IntegerType::get(C, num_bits); - } -}; - -template<> class TypeBuilder { -public: - static Type *get(LLVMContext& C) { - return Type::getFloatTy(C); - } -}; -template<> class TypeBuilder {}; - -template<> class TypeBuilder { -public: - static Type *get(LLVMContext& C) { - return Type::getDoubleTy(C); - } -}; -template<> class TypeBuilder {}; - -template class TypeBuilder { -public: - static Type *get(LLVMContext& C) { return Type::getFloatTy(C); } -}; -template class TypeBuilder { -public: - static Type *get(LLVMContext& C) { return Type::getDoubleTy(C); } -}; -template class TypeBuilder { -public: - static Type *get(LLVMContext& C) { return Type::getX86_FP80Ty(C); } -}; -template class TypeBuilder { -public: - static Type *get(LLVMContext& C) { return Type::getFP128Ty(C); } -}; -template class TypeBuilder { -public: - static Type *get(LLVMContext& C) { return Type::getPPC_FP128Ty(C); } -}; -template class TypeBuilder { -public: - static Type *get(LLVMContext& C) { return Type::getX86_MMXTy(C); } -}; - -template class TypeBuilder { -public: - static Type *get(LLVMContext &C) { - return Type::getVoidTy(C); - } -}; - -/// void* is disallowed in LLVM types, but it occurs often enough in C code that -/// we special case it. -template<> class TypeBuilder - : public TypeBuilder*, false> {}; -template<> class TypeBuilder - : public TypeBuilder*, false> {}; -template<> class TypeBuilder - : public TypeBuilder*, false> {}; -template<> class TypeBuilder - : public TypeBuilder*, false> {}; - -template class TypeBuilder { -public: - static FunctionType *get(LLVMContext &Context) { - return FunctionType::get(TypeBuilder::get(Context), false); - } -}; -template class TypeBuilder { -public: - static FunctionType *get(LLVMContext &Context) { - Type *params[] = { - TypeBuilder::get(Context), - }; - return FunctionType::get(TypeBuilder::get(Context), - params, false); - } -}; -template -class TypeBuilder { -public: - static FunctionType *get(LLVMContext &Context) { - Type *params[] = { - TypeBuilder::get(Context), - TypeBuilder::get(Context), - }; - return FunctionType::get(TypeBuilder::get(Context), - params, false); - } -}; -template -class TypeBuilder { -public: - static FunctionType *get(LLVMContext &Context) { - Type *params[] = { - TypeBuilder::get(Context), - TypeBuilder::get(Context), - TypeBuilder::get(Context), - }; - return FunctionType::get(TypeBuilder::get(Context), - params, false); - } -}; - -template -class TypeBuilder { -public: - static FunctionType *get(LLVMContext &Context) { - Type *params[] = { - TypeBuilder::get(Context), - TypeBuilder::get(Context), - TypeBuilder::get(Context), - TypeBuilder::get(Context), - }; - return FunctionType::get(TypeBuilder::get(Context), - params, false); - } -}; - -template -class TypeBuilder { -public: - static FunctionType *get(LLVMContext &Context) { - Type *params[] = { - TypeBuilder::get(Context), - TypeBuilder::get(Context), - TypeBuilder::get(Context), - TypeBuilder::get(Context), - TypeBuilder::get(Context), - }; - return FunctionType::get(TypeBuilder::get(Context), - params, false); - } -}; - -template class TypeBuilder { -public: - static FunctionType *get(LLVMContext &Context) { - return FunctionType::get(TypeBuilder::get(Context), true); - } -}; -template -class TypeBuilder { -public: - static FunctionType *get(LLVMContext &Context) { - Type *params[] = { - TypeBuilder::get(Context), - }; - return FunctionType::get(TypeBuilder::get(Context), params, true); - } -}; -template -class TypeBuilder { -public: - static FunctionType *get(LLVMContext &Context) { - Type *params[] = { - TypeBuilder::get(Context), - TypeBuilder::get(Context), - }; - return FunctionType::get(TypeBuilder::get(Context), - params, true); - } -}; -template -class TypeBuilder { -public: - static FunctionType *get(LLVMContext &Context) { - Type *params[] = { - TypeBuilder::get(Context), - TypeBuilder::get(Context), - TypeBuilder::get(Context), - }; - return FunctionType::get(TypeBuilder::get(Context), - params, true); - } -}; - -template -class TypeBuilder { -public: - static FunctionType *get(LLVMContext &Context) { - Type *params[] = { - TypeBuilder::get(Context), - TypeBuilder::get(Context), - TypeBuilder::get(Context), - TypeBuilder::get(Context), - }; - return FunctionType::get(TypeBuilder::get(Context), - params, true); - } -}; - -template -class TypeBuilder { -public: - static FunctionType *get(LLVMContext &Context) { - Type *params[] = { - TypeBuilder::get(Context), - TypeBuilder::get(Context), - TypeBuilder::get(Context), - TypeBuilder::get(Context), - TypeBuilder::get(Context), - }; - return FunctionType::get(TypeBuilder::get(Context), - params, true); - } -}; - -} // namespace llvm - -#endif diff --git a/tools/lli/lli.cpp b/tools/lli/lli.cpp index e4a7462a635..7e93d31361a 100644 --- a/tools/lli/lli.cpp +++ b/tools/lli/lli.cpp @@ -35,7 +35,6 @@ #include "llvm/IR/LLVMContext.h" #include "llvm/IR/Module.h" #include "llvm/IR/Type.h" -#include "llvm/IR/TypeBuilder.h" #include "llvm/IR/Verifier.h" #include "llvm/IRReader/IRReader.h" #include "llvm/Object/Archive.h" @@ -317,23 +316,18 @@ static void addCygMingExtraModule(ExecutionEngine &EE, LLVMContext &Context, M->setTargetTriple(TargetTripleStr); // Create an empty function named "__main". - Function *Result; - if (TargetTriple.isArch64Bit()) { - Result = Function::Create( - TypeBuilder::get(Context), - GlobalValue::ExternalLinkage, "__main", M.get()); - } else { - Result = Function::Create( - TypeBuilder::get(Context), - GlobalValue::ExternalLinkage, "__main", M.get()); - } - BasicBlock *BB = BasicBlock::Create(Context, "__main", Result); - Builder.SetInsertPoint(BB); - Value *ReturnVal; + Type *ReturnTy; if (TargetTriple.isArch64Bit()) - ReturnVal = ConstantInt::get(Context, APInt(64, 0)); + ReturnTy = Type::getInt64Ty(Context); else - ReturnVal = ConstantInt::get(Context, APInt(32, 0)); + ReturnTy = Type::getInt32Ty(Context); + Function *Result = + Function::Create(FunctionType::get(ReturnTy, {}, false), + GlobalValue::ExternalLinkage, "__main", M.get()); + + BasicBlock *BB = BasicBlock::Create(Context, "__main", Result); + Builder.SetInsertPoint(BB); + Value *ReturnVal = ConstantInt::get(ReturnTy, 0); Builder.CreateRet(ReturnVal); // Add this new module to the ExecutionEngine. diff --git a/unittests/ExecutionEngine/MCJIT/MCJITMultipleModuleTest.cpp b/unittests/ExecutionEngine/MCJIT/MCJITMultipleModuleTest.cpp index 1226bba1c50..856ae459760 100644 --- a/unittests/ExecutionEngine/MCJIT/MCJITMultipleModuleTest.cpp +++ b/unittests/ExecutionEngine/MCJIT/MCJITMultipleModuleTest.cpp @@ -175,7 +175,7 @@ TEST_F(MCJITMultipleModuleTest, two_module_consecutive_call_case) { std::unique_ptr A, B; Function *FA1, *FA2, *FB; createTwoModuleExternCase(A, FA1, B, FB); - FA2 = insertSimpleCallFunction(A.get(), FA1); + FA2 = insertSimpleCallFunction(A.get(), FA1); createJIT(std::move(A)); TheJIT->addModule(std::move(B)); @@ -203,15 +203,18 @@ TEST_F(MCJITMultipleModuleTest, two_module_global_variables_case) { std::unique_ptr A, B; Function *FA, *FB; GlobalVariable *GVA, *GVB, *GVC; + A.reset(createEmptyModule("A")); B.reset(createEmptyModule("B")); int32_t initialNum = 7; GVA = insertGlobalInt32(A.get(), "GVA", initialNum); GVB = insertGlobalInt32(B.get(), "GVB", initialNum); - FA = startFunction(A.get(), "FA"); + FA = startFunction(A.get(), + FunctionType::get(Builder.getInt32Ty(), {}, false), "FA"); endFunctionWithRet(FA, Builder.CreateLoad(GVA)); - FB = startFunction(B.get(), "FB"); + FB = startFunction(B.get(), + FunctionType::get(Builder.getInt32Ty(), {}, false), "FB"); endFunctionWithRet(FB, Builder.CreateLoad(GVB)); GVC = insertGlobalInt32(B.get(), "GVC", initialNum); diff --git a/unittests/ExecutionEngine/MCJIT/MCJITTest.cpp b/unittests/ExecutionEngine/MCJIT/MCJITTest.cpp index e7da75a6d7e..8972fb677be 100644 --- a/unittests/ExecutionEngine/MCJIT/MCJITTest.cpp +++ b/unittests/ExecutionEngine/MCJIT/MCJITTest.cpp @@ -99,8 +99,9 @@ TEST_F(MCJITTest, return_global) { int32_t initialNum = 7; GlobalVariable *GV = insertGlobalInt32(M.get(), "myglob", initialNum); - Function *ReturnGlobal = startFunction(M.get(), - "ReturnGlobal"); + Function *ReturnGlobal = + startFunction(M.get(), FunctionType::get(Builder.getInt32Ty(), {}, false), + "ReturnGlobal"); Value *ReadGlobal = Builder.CreateLoad(GV); endFunctionWithRet(ReturnGlobal, ReadGlobal); @@ -126,7 +127,10 @@ TEST_F(MCJITTest, increment_global) { SKIP_UNSUPPORTED_PLATFORM; int32_t initialNum = 5; - Function *IncrementGlobal = startFunction(M.get(), "IncrementGlobal"); + Function *IncrementGlobal = startFunction( + M.get(), + FunctionType::get(Builder.getInt32Ty(), {}, false), + "IncrementGlobal"); GlobalVariable *GV = insertGlobalInt32(M.get(), "my_global", initialNum); Value *DerefGV = Builder.CreateLoad(GV); Value *AddResult = Builder.CreateAdd(DerefGV, @@ -161,14 +165,17 @@ TEST_F(MCJITTest, multiple_functions) { unsigned int numLevels = 23; int32_t innerRetVal= 5; - Function *Inner = startFunction(M.get(), "Inner"); + Function *Inner = startFunction( + M.get(), FunctionType::get(Builder.getInt32Ty(), {}, false), "Inner"); endFunctionWithRet(Inner, ConstantInt::get(Context, APInt(32, innerRetVal))); Function *Outer; for (unsigned int i = 0; i < numLevels; ++i) { std::stringstream funcName; funcName << "level_" << i; - Outer = startFunction(M.get(), funcName.str()); + Outer = startFunction(M.get(), + FunctionType::get(Builder.getInt32Ty(), {}, false), + funcName.str()); Value *innerResult = Builder.CreateCall(Inner, {}); endFunctionWithRet(Outer, innerResult); @@ -190,7 +197,8 @@ TEST_F(MCJITTest, multiple_functions) { TEST_F(MCJITTest, multiple_decl_lookups) { SKIP_UNSUPPORTED_PLATFORM; - Function *Foo = insertExternalReferenceToFunction(M.get(), "_exit"); + Function *Foo = insertExternalReferenceToFunction( + M.get(), FunctionType::get(Builder.getVoidTy(), {}, false), "_exit"); createJIT(std::move(M)); void *A = TheJIT->getPointerToFunction(Foo); void *B = TheJIT->getPointerToFunction(Foo); @@ -203,10 +211,12 @@ typedef void * (*FunctionHandlerPtr)(const std::string &str); TEST_F(MCJITTest, lazy_function_creator_pointer) { SKIP_UNSUPPORTED_PLATFORM; - - Function *Foo = insertExternalReferenceToFunction(M.get(), - "\1Foo"); - startFunction(M.get(), "Parent"); + + Function *Foo = insertExternalReferenceToFunction( + M.get(), FunctionType::get(Builder.getInt32Ty(), {}, false), + "\1Foo"); + startFunction(M.get(), FunctionType::get(Builder.getInt32Ty(), {}, false), + "Parent"); CallInst *Call = Builder.CreateCall(Foo, {}); Builder.CreateRet(Call); @@ -240,12 +250,14 @@ TEST_F(MCJITTest, lazy_function_creator_pointer) { TEST_F(MCJITTest, lazy_function_creator_lambda) { SKIP_UNSUPPORTED_PLATFORM; - - Function *Foo1 = insertExternalReferenceToFunction(M.get(), - "\1Foo1"); - Function *Foo2 = insertExternalReferenceToFunction(M.get(), - "\1Foo2"); - startFunction(M.get(), "Parent"); + + FunctionType *Int32VoidFnTy = + FunctionType::get(Builder.getInt32Ty(), {}, false); + Function *Foo1 = + insertExternalReferenceToFunction(M.get(), Int32VoidFnTy, "\1Foo1"); + Function *Foo2 = + insertExternalReferenceToFunction(M.get(), Int32VoidFnTy, "\1Foo2"); + startFunction(M.get(), Int32VoidFnTy, "Parent"); CallInst *Call1 = Builder.CreateCall(Foo1, {}); CallInst *Call2 = Builder.CreateCall(Foo2, {}); Value *Result = Builder.CreateAdd(Call1, Call2); diff --git a/unittests/ExecutionEngine/MCJIT/MCJITTestBase.h b/unittests/ExecutionEngine/MCJIT/MCJITTestBase.h index a768920ff47..50a57f141f4 100644 --- a/unittests/ExecutionEngine/MCJIT/MCJITTestBase.h +++ b/unittests/ExecutionEngine/MCJIT/MCJITTestBase.h @@ -24,7 +24,7 @@ #include "llvm/IR/IRBuilder.h" #include "llvm/IR/LLVMContext.h" #include "llvm/IR/Module.h" -#include "llvm/IR/TypeBuilder.h" +#include "llvm/IR/Type.h" #include "llvm/Support/CodeGen.h" namespace llvm { @@ -45,11 +45,9 @@ class TrivialModuleBuilder { return M; } - template - Function *startFunction(Module *M, StringRef Name) { - Function *Result = Function::Create( - TypeBuilder::get(Context), - GlobalValue::ExternalLinkage, Name, M); + Function *startFunction(Module *M, FunctionType *FT, StringRef Name) { + Function *Result = + Function::Create(FT, GlobalValue::ExternalLinkage, Name, M); BasicBlock *BB = BasicBlock::Create(Context, Name, Result); Builder.SetInsertPoint(BB); @@ -63,9 +61,8 @@ class TrivialModuleBuilder { // Inserts a simple function that invokes Callee and takes the same arguments: // int Caller(...) { return Callee(...); } - template Function *insertSimpleCallFunction(Module *M, Function *Callee) { - Function *Result = startFunction(M, "caller"); + Function *Result = startFunction(M, Callee->getFunctionType(), "caller"); SmallVector CallArgs; @@ -81,7 +78,8 @@ class TrivialModuleBuilder { // int32_t main() { return X; } // where X is given by returnCode Function *insertMainFunction(Module *M, uint32_t returnCode) { - Function *Result = startFunction(M, "main"); + Function *Result = startFunction( + M, FunctionType::get(Type::getInt32Ty(Context), {}, false), "main"); Value *ReturnVal = ConstantInt::get(Context, APInt(32, returnCode)); endFunctionWithRet(Result, ReturnVal); @@ -93,7 +91,12 @@ class TrivialModuleBuilder { // int32_t add(int32_t a, int32_t b) { return a + b; } // in the current module and returns a pointer to it. Function *insertAddFunction(Module *M, StringRef Name = "add") { - Function *Result = startFunction(M, Name); + Function *Result = startFunction( + M, + FunctionType::get( + Type::getInt32Ty(Context), + {Type::getInt32Ty(Context), Type::getInt32Ty(Context)}, false), + Name); Function::arg_iterator args = Result->arg_begin(); Value *Arg1 = &*args; @@ -106,20 +109,10 @@ class TrivialModuleBuilder { } // Inserts a declaration to a function defined elsewhere - template - Function *insertExternalReferenceToFunction(Module *M, StringRef Name) { - Function *Result = Function::Create( - TypeBuilder::get(Context), - GlobalValue::ExternalLinkage, Name, M); - return Result; - } - - // Inserts an declaration to a function defined elsewhere - Function *insertExternalReferenceToFunction(Module *M, StringRef Name, - FunctionType *FuncTy) { - Function *Result = Function::Create(FuncTy, - GlobalValue::ExternalLinkage, - Name, M); + Function *insertExternalReferenceToFunction(Module *M, FunctionType *FTy, + StringRef Name) { + Function *Result = + Function::Create(FTy, GlobalValue::ExternalLinkage, Name, M); return Result; } @@ -136,7 +129,7 @@ class TrivialModuleBuilder { GlobalVariable *insertGlobalInt32(Module *M, StringRef name, int32_t InitialValue) { - Type *GlobalTy = TypeBuilder, true>::get(Context); + Type *GlobalTy = Type::getInt32Ty(Context); Constant *IV = ConstantInt::get(Context, APInt(32, InitialValue)); GlobalVariable *Global = new GlobalVariable(*M, GlobalTy, @@ -160,7 +153,11 @@ class TrivialModuleBuilder { Function *insertAccumulateFunction(Module *M, Function *Helper = nullptr, StringRef Name = "accumulate") { - Function *Result = startFunction(M, Name); + Function *Result = + startFunction(M, + FunctionType::get(Type::getInt32Ty(Context), + {Type::getInt32Ty(Context)}, false), + Name); if (!Helper) Helper = Result; @@ -225,11 +222,11 @@ class TrivialModuleBuilder { B.reset(createEmptyModule("B")); Function *FAExtern_in_B = insertExternalReferenceToFunction(B.get(), FA); - FB = insertSimpleCallFunction(B.get(), FAExtern_in_B); + FB = insertSimpleCallFunction(B.get(), FAExtern_in_B); C.reset(createEmptyModule("C")); Function *FBExtern_in_C = insertExternalReferenceToFunction(C.get(), FB); - FC = insertSimpleCallFunction(C.get(), FBExtern_in_C); + FC = insertSimpleCallFunction(C.get(), FBExtern_in_C); } // Module A { Function FA }, @@ -253,8 +250,7 @@ class TrivialModuleBuilder { B.reset(createEmptyModule("B")); Function *FAExtern_in_B = insertExternalReferenceToFunction(B.get(), FA); - FB = insertSimpleCallFunction(B.get(), - FAExtern_in_B); + FB = insertSimpleCallFunction(B.get(), FAExtern_in_B); } // Module A { Function FA }, @@ -268,11 +264,11 @@ class TrivialModuleBuilder { B.reset(createEmptyModule("B")); Function *FAExtern_in_B = insertExternalReferenceToFunction(B.get(), FA); - FB = insertSimpleCallFunction(B.get(), FAExtern_in_B); + FB = insertSimpleCallFunction(B.get(), FAExtern_in_B); C.reset(createEmptyModule("C")); Function *FAExtern_in_C = insertExternalReferenceToFunction(C.get(), FA); - FC = insertSimpleCallFunction(C.get(), FAExtern_in_C); + FC = insertSimpleCallFunction(C.get(), FAExtern_in_C); } }; diff --git a/unittests/ExecutionEngine/Orc/IndirectionUtilsTest.cpp b/unittests/ExecutionEngine/Orc/IndirectionUtilsTest.cpp index ed425449784..1dfa0a1d492 100644 --- a/unittests/ExecutionEngine/Orc/IndirectionUtilsTest.cpp +++ b/unittests/ExecutionEngine/Orc/IndirectionUtilsTest.cpp @@ -19,7 +19,10 @@ namespace { TEST(IndirectionUtilsTest, MakeStub) { LLVMContext Context; ModuleBuilder MB(Context, "x86_64-apple-macosx10.10", ""); - Function *F = MB.createFunctionDecl(""); + FunctionType *FTy = FunctionType::get( + Type::getVoidTy(Context), + {getDummyStructTy(Context), getDummyStructTy(Context)}, false); + Function *F = MB.createFunctionDecl(FTy, ""); AttributeSet FnAttrs = AttributeSet::get( Context, AttrBuilder().addAttribute(Attribute::NoUnwind)); AttributeSet RetAttrs; // None diff --git a/unittests/ExecutionEngine/Orc/LegacyRTDyldObjectLinkingLayerTest.cpp b/unittests/ExecutionEngine/Orc/LegacyRTDyldObjectLinkingLayerTest.cpp index 8c9c958cc42..b3696c6ca4a 100644 --- a/unittests/ExecutionEngine/Orc/LegacyRTDyldObjectLinkingLayerTest.cpp +++ b/unittests/ExecutionEngine/Orc/LegacyRTDyldObjectLinkingLayerTest.cpp @@ -123,6 +123,8 @@ TEST_F(LegacyRTDyldObjectLinkingLayerExecutionTest, NoDuplicateFinalization) { if (!SupportsJIT) return; + Type *Int32Ty = IntegerType::get(Context, 32); + ExecutionSession ES; auto MM = std::make_shared(); @@ -153,7 +155,8 @@ TEST_F(LegacyRTDyldObjectLinkingLayerExecutionTest, NoDuplicateFinalization) { ModuleBuilder MB1(Context, "", "dummy"); { MB1.getModule()->setDataLayout(TM->createDataLayout()); - Function *BarImpl = MB1.createFunctionDecl("bar"); + Function *BarImpl = + MB1.createFunctionDecl(FunctionType::get(Int32Ty, {}, false), "bar"); BasicBlock *BarEntry = BasicBlock::Create(Context, "entry", BarImpl); IRBuilder<> Builder(BarEntry); IntegerType *Int32Ty = IntegerType::get(Context, 32); @@ -166,8 +169,10 @@ TEST_F(LegacyRTDyldObjectLinkingLayerExecutionTest, NoDuplicateFinalization) { ModuleBuilder MB2(Context, "", "dummy"); { MB2.getModule()->setDataLayout(TM->createDataLayout()); - Function *BarDecl = MB2.createFunctionDecl("bar"); - Function *FooImpl = MB2.createFunctionDecl("foo"); + Function *BarDecl = + MB2.createFunctionDecl(FunctionType::get(Int32Ty, {}, false), "bar"); + Function *FooImpl = + MB2.createFunctionDecl(FunctionType::get(Int32Ty, {}, false), "foo"); BasicBlock *FooEntry = BasicBlock::Create(Context, "entry", FooImpl); IRBuilder<> Builder(FooEntry); Builder.CreateRet(Builder.CreateCall(BarDecl)); @@ -207,6 +212,8 @@ TEST_F(LegacyRTDyldObjectLinkingLayerExecutionTest, NoPrematureAllocation) { if (!SupportsJIT) return; + Type *Int32Ty = IntegerType::get(Context, 32); + ExecutionSession ES; auto MM = std::make_shared(); @@ -233,7 +240,8 @@ TEST_F(LegacyRTDyldObjectLinkingLayerExecutionTest, NoPrematureAllocation) { ModuleBuilder MB1(Context, "", "dummy"); { MB1.getModule()->setDataLayout(TM->createDataLayout()); - Function *BarImpl = MB1.createFunctionDecl("foo"); + Function *BarImpl = + MB1.createFunctionDecl(FunctionType::get(Int32Ty, {}, false), "foo"); BasicBlock *BarEntry = BasicBlock::Create(Context, "entry", BarImpl); IRBuilder<> Builder(BarEntry); IntegerType *Int32Ty = IntegerType::get(Context, 32); @@ -246,7 +254,8 @@ TEST_F(LegacyRTDyldObjectLinkingLayerExecutionTest, NoPrematureAllocation) { ModuleBuilder MB2(Context, "", "dummy"); { MB2.getModule()->setDataLayout(TM->createDataLayout()); - Function *BarImpl = MB2.createFunctionDecl("bar"); + Function *BarImpl = + MB2.createFunctionDecl(FunctionType::get(Int32Ty, {}, false), "bar"); BasicBlock *BarEntry = BasicBlock::Create(Context, "entry", BarImpl); IRBuilder<> Builder(BarEntry); IntegerType *Int32Ty = IntegerType::get(Context, 32); diff --git a/unittests/ExecutionEngine/Orc/OrcCAPITest.cpp b/unittests/ExecutionEngine/Orc/OrcCAPITest.cpp index b288b6bab2c..54d81569626 100644 --- a/unittests/ExecutionEngine/Orc/OrcCAPITest.cpp +++ b/unittests/ExecutionEngine/Orc/OrcCAPITest.cpp @@ -27,8 +27,15 @@ class OrcCAPIExecutionTest : public testing::Test, public OrcExecutionTest { protected: std::unique_ptr createTestModule(const Triple &TT) { ModuleBuilder MB(Context, TT.str(), ""); - Function *TestFunc = MB.createFunctionDecl("testFunc"); - Function *Main = MB.createFunctionDecl("main"); + Type *IntTy = Type::getScalarTy(Context); + Function *TestFunc = + MB.createFunctionDecl(FunctionType::get(IntTy, {}, false), "testFunc"); + Function *Main = MB.createFunctionDecl( + FunctionType::get( + IntTy, + {IntTy, Type::getInt8PtrTy(Context)->getPointerTo()}, + false), + "main"); Main->getBasicBlockList().push_back(BasicBlock::Create(Context)); IRBuilder<> B(&Main->back()); diff --git a/unittests/ExecutionEngine/Orc/OrcTestCommon.h b/unittests/ExecutionEngine/Orc/OrcTestCommon.h index e76d2fae5e3..e25c513d947 100644 --- a/unittests/ExecutionEngine/Orc/OrcTestCommon.h +++ b/unittests/ExecutionEngine/Orc/OrcTestCommon.h @@ -22,7 +22,6 @@ #include "llvm/IR/IRBuilder.h" #include "llvm/IR/LLVMContext.h" #include "llvm/IR/Module.h" -#include "llvm/IR/TypeBuilder.h" #include "llvm/Object/ObjectFile.h" #include "llvm/Support/TargetRegistry.h" #include "llvm/Support/TargetSelect.h" @@ -169,11 +168,8 @@ class ModuleBuilder { ModuleBuilder(LLVMContext &Context, StringRef Triple, StringRef Name); - template - Function* createFunctionDecl(StringRef Name) { - return Function::Create( - TypeBuilder::get(M->getContext()), - GlobalValue::ExternalLinkage, Name, M.get()); + Function *createFunctionDecl(FunctionType *FTy, StringRef Name) { + return Function::Create(FTy, GlobalValue::ExternalLinkage, Name, M.get()); } Module* getModule() { return M.get(); } @@ -189,15 +185,9 @@ struct DummyStruct { int X[256]; }; -// TypeBuilder specialization for DummyStruct. -template -class TypeBuilder { -public: - static StructType *get(LLVMContext &Context) { - return StructType::get( - TypeBuilder[256], XCompile>::get(Context)); - } -}; +inline StructType *getDummyStructTy(LLVMContext &Context) { + return StructType::get(ArrayType::get(Type::getInt32Ty(Context), 256)); +} template class MockBaseLayer { diff --git a/unittests/ExecutionEngine/Orc/RTDyldObjectLinkingLayerTest.cpp b/unittests/ExecutionEngine/Orc/RTDyldObjectLinkingLayerTest.cpp index 6b1dbe93d5e..2db237f9a33 100644 --- a/unittests/ExecutionEngine/Orc/RTDyldObjectLinkingLayerTest.cpp +++ b/unittests/ExecutionEngine/Orc/RTDyldObjectLinkingLayerTest.cpp @@ -131,13 +131,17 @@ TEST(RTDyldObjectLinkingLayerTest, TestOverrideObjectFlags) { ModuleBuilder MB(*TSCtx.getContext(), TM->getTargetTriple().str(), "dummy"); MB.getModule()->setDataLayout(TM->createDataLayout()); - Function *FooImpl = MB.createFunctionDecl("foo"); + Function *FooImpl = MB.createFunctionDecl( + FunctionType::get(Type::getVoidTy(*TSCtx.getContext()), {}, false), + "foo"); BasicBlock *FooEntry = BasicBlock::Create(*TSCtx.getContext(), "entry", FooImpl); IRBuilder<> B1(FooEntry); B1.CreateRetVoid(); - Function *BarImpl = MB.createFunctionDecl("bar"); + Function *BarImpl = MB.createFunctionDecl( + FunctionType::get(Type::getVoidTy(*TSCtx.getContext()), {}, false), + "bar"); BasicBlock *BarEntry = BasicBlock::Create(*TSCtx.getContext(), "entry", BarImpl); IRBuilder<> B2(BarEntry); @@ -181,9 +185,9 @@ TEST(RTDyldObjectLinkingLayerTest, TestAutoClaimResponsibilityForSymbols) { FunkySimpleCompiler(TargetMachine &TM) : SimpleCompiler(TM) {} CompileResult operator()(Module &M) { - Function *BarImpl = - Function::Create(TypeBuilder::get(M.getContext()), - GlobalValue::ExternalLinkage, "bar", &M); + Function *BarImpl = Function::Create( + FunctionType::get(Type::getVoidTy(M.getContext()), {}, false), + GlobalValue::ExternalLinkage, "bar", &M); BasicBlock *BarEntry = BasicBlock::Create(M.getContext(), "entry", BarImpl); IRBuilder<> B(BarEntry); @@ -200,7 +204,9 @@ TEST(RTDyldObjectLinkingLayerTest, TestAutoClaimResponsibilityForSymbols) { ModuleBuilder MB(*TSCtx.getContext(), TM->getTargetTriple().str(), "dummy"); MB.getModule()->setDataLayout(TM->createDataLayout()); - Function *FooImpl = MB.createFunctionDecl("foo"); + Function *FooImpl = MB.createFunctionDecl( + FunctionType::get(Type::getVoidTy(*TSCtx.getContext()), {}, false), + "foo"); BasicBlock *FooEntry = BasicBlock::Create(*TSCtx.getContext(), "entry", FooImpl); IRBuilder<> B(FooEntry); diff --git a/unittests/ExecutionEngine/Orc/RemoteObjectLayerTest.cpp b/unittests/ExecutionEngine/Orc/RemoteObjectLayerTest.cpp index 09224c289b4..4ffd7416a4a 100644 --- a/unittests/ExecutionEngine/Orc/RemoteObjectLayerTest.cpp +++ b/unittests/ExecutionEngine/Orc/RemoteObjectLayerTest.cpp @@ -95,7 +95,12 @@ MockObjectLayer::ObjectPtr createTestObject() { LLVMContext Ctx; ModuleBuilder MB(Ctx, TM->getTargetTriple().str(), "TestModule"); MB.getModule()->setDataLayout(TM->createDataLayout()); - auto *Main = MB.createFunctionDecl("main"); + auto *Main = MB.createFunctionDecl( + FunctionType::get(Type::getInt32Ty(Ctx), + {Type::getInt32Ty(Ctx), + Type::getInt8PtrTy(Ctx)->getPointerTo()}, + false), + "main"); Main->getBasicBlockList().push_back(BasicBlock::Create(Ctx)); IRBuilder<> B(&Main->back()); B.CreateRet(ConstantInt::getSigned(Type::getInt32Ty(Ctx), 42)); diff --git a/unittests/IR/CFGBuilder.cpp b/unittests/IR/CFGBuilder.cpp index 0f9fb8b18cc..886ab8a9de2 100644 --- a/unittests/IR/CFGBuilder.cpp +++ b/unittests/IR/CFGBuilder.cpp @@ -11,7 +11,6 @@ #include "llvm/IR/IRBuilder.h" #include "llvm/IR/LLVMContext.h" -#include "llvm/IR/TypeBuilder.h" #include "llvm/Support/Debug.h" #include "llvm/Support/raw_ostream.h" #include "gtest/gtest.h" @@ -23,7 +22,7 @@ using namespace llvm; CFGHolder::CFGHolder(StringRef ModuleName, StringRef FunctionName) : Context(llvm::make_unique()), M(llvm::make_unique(ModuleName, *Context)) { - FunctionType *FTy = TypeBuilder::get(*Context); + FunctionType *FTy = FunctionType::get(Type::getVoidTy(*Context), {}, false); F = cast(M->getOrInsertFunction(FunctionName, FTy)); } CFGHolder::~CFGHolder() = default; diff --git a/unittests/IR/CMakeLists.txt b/unittests/IR/CMakeLists.txt index 7498983b260..f33835f6549 100644 --- a/unittests/IR/CMakeLists.txt +++ b/unittests/IR/CMakeLists.txt @@ -30,7 +30,6 @@ add_llvm_unittest(IRTests ModuleTest.cpp PassManagerTest.cpp PatternMatch.cpp - TypeBuilderTest.cpp TypesTest.cpp UseTest.cpp UserTest.cpp diff --git a/unittests/IR/TypeBuilderTest.cpp b/unittests/IR/TypeBuilderTest.cpp deleted file mode 100644 index 9ba776543d9..00000000000 --- a/unittests/IR/TypeBuilderTest.cpp +++ /dev/null @@ -1,284 +0,0 @@ -//===- llvm/unittest/TypeBuilderTest.cpp - TypeBuilder tests --------------===// -// -// The LLVM Compiler Infrastructure -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// - -#include "llvm/IR/TypeBuilder.h" -#include "llvm/IR/LLVMContext.h" -#include "gtest/gtest.h" - -using namespace llvm; - -namespace { - -TEST(TypeBuilderTest, Void) { - LLVMContext Context; - EXPECT_EQ(Type::getVoidTy(Context), (TypeBuilder::get(Context))); - EXPECT_EQ(Type::getVoidTy(Context), (TypeBuilder::get(Context))); - // Special cases for C compatibility: - EXPECT_EQ(Type::getInt8PtrTy(Context), - (TypeBuilder::get(Context))); - EXPECT_EQ(Type::getInt8PtrTy(Context), - (TypeBuilder::get(Context))); - EXPECT_EQ(Type::getInt8PtrTy(Context), - (TypeBuilder::get(Context))); - EXPECT_EQ(Type::getInt8PtrTy(Context), - (TypeBuilder::get(Context))); -} - -TEST(TypeBuilderTest, HostIntegers) { - LLVMContext Context; - EXPECT_EQ(Type::getInt8Ty(Context), - (TypeBuilder::get(Context))); - EXPECT_EQ(Type::getInt8Ty(Context), - (TypeBuilder::get(Context))); - EXPECT_EQ(Type::getInt16Ty(Context), - (TypeBuilder::get(Context))); - EXPECT_EQ(Type::getInt16Ty(Context), - (TypeBuilder::get(Context))); - EXPECT_EQ(Type::getInt32Ty(Context), - (TypeBuilder::get(Context))); - EXPECT_EQ(Type::getInt32Ty(Context), - (TypeBuilder::get(Context))); - EXPECT_EQ(Type::getInt64Ty(Context), - (TypeBuilder::get(Context))); - EXPECT_EQ(Type::getInt64Ty(Context), - (TypeBuilder::get(Context))); - - EXPECT_EQ(IntegerType::get(Context, sizeof(size_t) * CHAR_BIT), - (TypeBuilder::get(Context))); - EXPECT_EQ(IntegerType::get(Context, sizeof(ptrdiff_t) * CHAR_BIT), - (TypeBuilder::get(Context))); -} - -TEST(TypeBuilderTest, CrossCompilableIntegers) { - LLVMContext Context; - EXPECT_EQ(IntegerType::get(Context, 1), - (TypeBuilder, true>::get(Context))); - EXPECT_EQ(IntegerType::get(Context, 1), - (TypeBuilder, false>::get(Context))); - EXPECT_EQ(IntegerType::get(Context, 72), - (TypeBuilder, true>::get(Context))); - EXPECT_EQ(IntegerType::get(Context, 72), - (TypeBuilder, false>::get(Context))); -} - -TEST(TypeBuilderTest, Float) { - LLVMContext Context; - EXPECT_EQ(Type::getFloatTy(Context), - (TypeBuilder::get(Context))); - EXPECT_EQ(Type::getDoubleTy(Context), - (TypeBuilder::get(Context))); - // long double isn't supported yet. - EXPECT_EQ(Type::getFloatTy(Context), - (TypeBuilder::get(Context))); - EXPECT_EQ(Type::getFloatTy(Context), - (TypeBuilder::get(Context))); - EXPECT_EQ(Type::getDoubleTy(Context), - (TypeBuilder::get(Context))); - EXPECT_EQ(Type::getDoubleTy(Context), - (TypeBuilder::get(Context))); - EXPECT_EQ(Type::getX86_FP80Ty(Context), - (TypeBuilder::get(Context))); - EXPECT_EQ(Type::getX86_FP80Ty(Context), - (TypeBuilder::get(Context))); - EXPECT_EQ(Type::getFP128Ty(Context), - (TypeBuilder::get(Context))); - EXPECT_EQ(Type::getFP128Ty(Context), - (TypeBuilder::get(Context))); - EXPECT_EQ(Type::getPPC_FP128Ty(Context), - (TypeBuilder::get(Context))); - EXPECT_EQ(Type::getPPC_FP128Ty(Context), - (TypeBuilder::get(Context))); -} - -TEST(TypeBuilderTest, Derived) { - LLVMContext Context; - EXPECT_EQ(PointerType::getUnqual(Type::getInt8PtrTy(Context)), - (TypeBuilder::get(Context))); - EXPECT_EQ(ArrayType::get(Type::getInt8Ty(Context), 7), - (TypeBuilder::get(Context))); - EXPECT_EQ(ArrayType::get(Type::getInt8Ty(Context), 0), - (TypeBuilder::get(Context))); - - EXPECT_EQ(PointerType::getUnqual(Type::getInt8PtrTy(Context)), - (TypeBuilder **, false>::get(Context))); - EXPECT_EQ(ArrayType::get(Type::getInt8Ty(Context), 7), - (TypeBuilder[7], false>::get(Context))); - EXPECT_EQ(ArrayType::get(Type::getInt8Ty(Context), 0), - (TypeBuilder[], false>::get(Context))); - - EXPECT_EQ(PointerType::getUnqual(Type::getInt8PtrTy(Context)), - (TypeBuilder **, true>::get(Context))); - EXPECT_EQ(ArrayType::get(Type::getInt8Ty(Context), 7), - (TypeBuilder[7], true>::get(Context))); - EXPECT_EQ(ArrayType::get(Type::getInt8Ty(Context), 0), - (TypeBuilder[], true>::get(Context))); - - EXPECT_EQ(Type::getInt8Ty(Context), - (TypeBuilder::get(Context))); - EXPECT_EQ(Type::getInt8Ty(Context), - (TypeBuilder::get(Context))); - EXPECT_EQ(Type::getInt8Ty(Context), - (TypeBuilder::get(Context))); - - EXPECT_EQ(Type::getInt8Ty(Context), - (TypeBuilder, false>::get(Context))); - EXPECT_EQ(Type::getInt8Ty(Context), - (TypeBuilder, false>::get(Context))); - EXPECT_EQ(Type::getInt8Ty(Context), - (TypeBuilder, false>::get(Context))); - - EXPECT_EQ(Type::getInt8Ty(Context), - (TypeBuilder, true>::get(Context))); - EXPECT_EQ(Type::getInt8Ty(Context), - (TypeBuilder, true>::get(Context))); - EXPECT_EQ(Type::getInt8Ty(Context), - (TypeBuilder, true>::get(Context))); - - EXPECT_EQ(Type::getInt8PtrTy(Context), - (TypeBuilder::get( - Context))); -} - -TEST(TypeBuilderTest, Functions) { - LLVMContext Context; - std::vector params; - EXPECT_EQ(FunctionType::get(Type::getVoidTy(Context), params, false), - (TypeBuilder::get(Context))); - EXPECT_EQ(FunctionType::get(Type::getInt8Ty(Context), params, true), - (TypeBuilder::get(Context))); - params.push_back(TypeBuilder::get(Context)); - EXPECT_EQ(FunctionType::get(Type::getInt8Ty(Context), params, false), - (TypeBuilder::get(Context))); - EXPECT_EQ(FunctionType::get(Type::getInt8Ty(Context), params, true), - (TypeBuilder::get(Context))); - params.push_back(TypeBuilder::get(Context)); - EXPECT_EQ(FunctionType::get(Type::getInt8Ty(Context), params, false), - (TypeBuilder::get(Context))); - EXPECT_EQ(FunctionType::get(Type::getInt8Ty(Context), params, true), - (TypeBuilder::get(Context))); - params.push_back(TypeBuilder::get(Context)); - EXPECT_EQ( - FunctionType::get(Type::getInt8Ty(Context), params, false), - (TypeBuilder::get(Context))); - EXPECT_EQ( - FunctionType::get(Type::getInt8Ty(Context), params, true), - (TypeBuilder::get(Context))); - params.push_back(TypeBuilder::get(Context)); - EXPECT_EQ(FunctionType::get(Type::getInt8Ty(Context), params, false), - (TypeBuilder::get( - Context))); - EXPECT_EQ( - FunctionType::get(Type::getInt8Ty(Context), params, true), - (TypeBuilder::get( - Context))); - params.push_back(TypeBuilder::get(Context)); - EXPECT_EQ( - FunctionType::get(Type::getInt8Ty(Context), params, false), - (TypeBuilder::get( - Context))); - EXPECT_EQ(FunctionType::get(Type::getInt8Ty(Context), params, true), - (TypeBuilder::get(Context))); -} - -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, true>::get(context1))->getContext()); - LLVMContext context2; - EXPECT_EQ(&context2, - &(TypeBuilder, true>::get(context2))->getContext()); -} - -struct MyType { - int a; - int *b; - void *array[1]; -}; - -struct MyPortableType { - int32_t a; - int32_t *b; - void *array[1]; -}; - -} // anonymous namespace - -namespace llvm { -template class TypeBuilder { -public: - static StructType *get(LLVMContext &Context) { - // Using the static result variable ensures that the type is - // only looked up once. - std::vector st; - st.push_back(TypeBuilder::get(Context)); - st.push_back(TypeBuilder::get(Context)); - st.push_back(TypeBuilder::get(Context)); - static StructType *const result = StructType::get(Context, st); - return result; - } - - // You may find this a convenient place to put some constants - // to help with getelementptr. They don't have any effect on - // the operation of TypeBuilder. - enum Fields { - FIELD_A, - FIELD_B, - FIELD_ARRAY - }; -}; - -template class TypeBuilder { -public: - static StructType *get(LLVMContext &Context) { - // Using the static result variable ensures that the type is - // only looked up once. - std::vector st; - st.push_back(TypeBuilder, cross>::get(Context)); - st.push_back(TypeBuilder*, cross>::get(Context)); - st.push_back(TypeBuilder*[], cross>::get(Context)); - static StructType *const result = StructType::get(Context, st); - return result; - } - - // You may find this a convenient place to put some constants - // to help with getelementptr. They don't have any effect on - // the operation of TypeBuilder. - enum Fields { - FIELD_A, - FIELD_B, - FIELD_ARRAY - }; -}; -} // namespace llvm -namespace { - -TEST(TypeBuilderTest, Extensions) { - LLVMContext Context; - EXPECT_EQ(PointerType::getUnqual( - StructType::get(TypeBuilder::get(Context), - TypeBuilder::get(Context), - TypeBuilder::get(Context))), - (TypeBuilder::get(Context))); - EXPECT_EQ(PointerType::getUnqual(StructType::get( - TypeBuilder, false>::get(Context), - TypeBuilder *, false>::get(Context), - TypeBuilder *[], false>::get(Context))), - (TypeBuilder::get(Context))); - EXPECT_EQ(PointerType::getUnqual(StructType::get( - TypeBuilder, false>::get(Context), - TypeBuilder *, false>::get(Context), - TypeBuilder *[], false>::get(Context))), - (TypeBuilder::get(Context))); -} - -} // anonymous namespace diff --git a/utils/gn/secondary/llvm/unittests/IR/BUILD.gn b/utils/gn/secondary/llvm/unittests/IR/BUILD.gn index 20383a51b83..b02a66cf037 100644 --- a/utils/gn/secondary/llvm/unittests/IR/BUILD.gn +++ b/utils/gn/secondary/llvm/unittests/IR/BUILD.gn @@ -33,7 +33,6 @@ unittest("IRTests") { "PassBuilderCallbacksTest.cpp", "PassManagerTest.cpp", "PatternMatch.cpp", - "TypeBuilderTest.cpp", "TypesTest.cpp", "UseTest.cpp", "UserTest.cpp",