From 0e3ed1b1f3e67647f16e9dd6bb1cf7726795f458 Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Sun, 15 Jul 2012 23:45:24 +0000 Subject: [PATCH] Move llvm/Support/TypeBuilder.h -> llvm/TypeBuilder.h. This completes the move of *Builder classes into the Core library. No uses of this builder in Clang or DragonEgg I could find. If there is a desire to have an IR-building-support library that contains all of these builders, that can be easily added, but currently it seems likely that these add no real overhead to VMCore. llvm-svn: 160243 --- include/llvm/{Support => }/TypeBuilder.h | 6 +++--- lib/Analysis/PathNumbering.cpp | 2 +- lib/Transforms/Instrumentation/PathProfiling.cpp | 2 +- unittests/ExecutionEngine/JIT/JITEventListenerTest.cpp | 2 +- unittests/ExecutionEngine/JIT/JITEventListenerTestCommon.h | 2 +- unittests/ExecutionEngine/JIT/JITTest.cpp | 2 +- unittests/Support/CMakeLists.txt | 1 - unittests/VMCore/CMakeLists.txt | 1 + unittests/{Support => VMCore}/TypeBuilderTest.cpp | 4 ++-- 9 files changed, 11 insertions(+), 11 deletions(-) rename include/llvm/{Support => }/TypeBuilder.h (99%) rename unittests/{Support => VMCore}/TypeBuilderTest.cpp (99%) diff --git a/include/llvm/Support/TypeBuilder.h b/include/llvm/TypeBuilder.h similarity index 99% rename from include/llvm/Support/TypeBuilder.h rename to include/llvm/TypeBuilder.h index c75606917c1..0b564797318 100644 --- a/include/llvm/Support/TypeBuilder.h +++ b/include/llvm/TypeBuilder.h @@ -1,4 +1,4 @@ -//===---- llvm/Support/TypeBuilder.h - Builder for LLVM types ---*- C++ -*-===// +//===---- llvm/TypeBuilder.h - Builder for LLVM types -----------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -12,8 +12,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_SUPPORT_TYPEBUILDER_H -#define LLVM_SUPPORT_TYPEBUILDER_H +#ifndef LLVM_TYPEBUILDER_H +#define LLVM_TYPEBUILDER_H #include "llvm/DerivedTypes.h" #include "llvm/LLVMContext.h" diff --git a/lib/Analysis/PathNumbering.cpp b/lib/Analysis/PathNumbering.cpp index 80c5222a27a..d4ad7264816 100644 --- a/lib/Analysis/PathNumbering.cpp +++ b/lib/Analysis/PathNumbering.cpp @@ -31,11 +31,11 @@ #include "llvm/Instructions.h" #include "llvm/Module.h" #include "llvm/Pass.h" +#include "llvm/TypeBuilder.h" #include "llvm/Support/CFG.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/Compiler.h" #include "llvm/Support/Debug.h" -#include "llvm/Support/TypeBuilder.h" #include "llvm/Support/raw_ostream.h" #include diff --git a/lib/Transforms/Instrumentation/PathProfiling.cpp b/lib/Transforms/Instrumentation/PathProfiling.cpp index b2147968dfa..cc27146ebcf 100644 --- a/lib/Transforms/Instrumentation/PathProfiling.cpp +++ b/lib/Transforms/Instrumentation/PathProfiling.cpp @@ -55,11 +55,11 @@ #include "llvm/LLVMContext.h" #include "llvm/Module.h" #include "llvm/Pass.h" +#include "llvm/TypeBuilder.h" #include "llvm/Support/Compiler.h" #include "llvm/Support/CFG.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/Debug.h" -#include "llvm/Support/TypeBuilder.h" #include "llvm/Support/raw_ostream.h" #include "llvm/Transforms/Utils/BasicBlockUtils.h" #include "llvm/Transforms/Instrumentation.h" diff --git a/unittests/ExecutionEngine/JIT/JITEventListenerTest.cpp b/unittests/ExecutionEngine/JIT/JITEventListenerTest.cpp index f8d88301ba1..333888a5655 100644 --- a/unittests/ExecutionEngine/JIT/JITEventListenerTest.cpp +++ b/unittests/ExecutionEngine/JIT/JITEventListenerTest.cpp @@ -12,10 +12,10 @@ #include "llvm/LLVMContext.h" #include "llvm/Instructions.h" #include "llvm/Module.h" +#include "llvm/TypeBuilder.h" #include "llvm/ADT/OwningPtr.h" #include "llvm/CodeGen/MachineCodeInfo.h" #include "llvm/ExecutionEngine/JIT.h" -#include "llvm/Support/TypeBuilder.h" #include "llvm/Support/TargetSelect.h" #include "gtest/gtest.h" #include diff --git a/unittests/ExecutionEngine/JIT/JITEventListenerTestCommon.h b/unittests/ExecutionEngine/JIT/JITEventListenerTestCommon.h index d669ecc03db..5f02b38847b 100644 --- a/unittests/ExecutionEngine/JIT/JITEventListenerTestCommon.h +++ b/unittests/ExecutionEngine/JIT/JITEventListenerTestCommon.h @@ -15,12 +15,12 @@ #include "llvm/IRBuilder.h" #include "llvm/Instructions.h" #include "llvm/Module.h" +#include "llvm/TypeBuilder.h" #include "llvm/CodeGen/MachineCodeInfo.h" #include "llvm/ExecutionEngine/JIT.h" #include "llvm/ExecutionEngine/JITEventListener.h" #include "llvm/Support/Dwarf.h" #include "llvm/Support/TargetSelect.h" -#include "llvm/Support/TypeBuilder.h" #include "llvm/Config/config.h" #include "gtest/gtest.h" diff --git a/unittests/ExecutionEngine/JIT/JITTest.cpp b/unittests/ExecutionEngine/JIT/JITTest.cpp index 8780aa556c4..0fde6fc66b9 100644 --- a/unittests/ExecutionEngine/JIT/JITTest.cpp +++ b/unittests/ExecutionEngine/JIT/JITTest.cpp @@ -18,6 +18,7 @@ #include "llvm/LLVMContext.h" #include "llvm/Module.h" #include "llvm/Type.h" +#include "llvm/TypeBuilder.h" #include "llvm/ADT/OwningPtr.h" #include "llvm/ADT/SmallPtrSet.h" #include "llvm/Assembly/Parser.h" @@ -27,7 +28,6 @@ #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/SourceMgr.h" #include "llvm/Support/TargetSelect.h" -#include "llvm/Support/TypeBuilder.h" #include "gtest/gtest.h" #include diff --git a/unittests/Support/CMakeLists.txt b/unittests/Support/CMakeLists.txt index 674da35dce8..ad16e627cfa 100644 --- a/unittests/Support/CMakeLists.txt +++ b/unittests/Support/CMakeLists.txt @@ -22,7 +22,6 @@ add_llvm_unittest(SupportTests RegexTest.cpp SwapByteOrderTest.cpp TimeValue.cpp - TypeBuilderTest.cpp ValueHandleTest.cpp YAMLParserTest.cpp ) diff --git a/unittests/VMCore/CMakeLists.txt b/unittests/VMCore/CMakeLists.txt index 79ee22c186d..b9029309273 100644 --- a/unittests/VMCore/CMakeLists.txt +++ b/unittests/VMCore/CMakeLists.txt @@ -11,6 +11,7 @@ set(VMCoreSources MDBuilderTest.cpp MetadataTest.cpp PassManagerTest.cpp + TypeBuilderTest.cpp ValueMapTest.cpp VerifierTest.cpp ) diff --git a/unittests/Support/TypeBuilderTest.cpp b/unittests/VMCore/TypeBuilderTest.cpp similarity index 99% rename from unittests/Support/TypeBuilderTest.cpp rename to unittests/VMCore/TypeBuilderTest.cpp index 1d3225726e9..a746b1f7384 100644 --- a/unittests/Support/TypeBuilderTest.cpp +++ b/unittests/VMCore/TypeBuilderTest.cpp @@ -1,4 +1,4 @@ -//===- llvm/unittest/Support/TypeBuilderTest.cpp - TypeBuilder tests -----===// +//===- llvm/unittest/TypeBuilderTest.cpp - TypeBuilder tests --------------===// // // The LLVM Compiler Infrastructure // @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#include "llvm/Support/TypeBuilder.h" +#include "llvm/TypeBuilder.h" #include "llvm/LLVMContext.h" #include "llvm/ADT/ArrayRef.h"