diff options
| -rw-r--r-- | include/llvm/IR/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | include/llvm/IR/Intrinsics.h | 2 | ||||
| -rw-r--r-- | lib/Analysis/BasicAliasAnalysis.cpp | 2 | ||||
| -rw-r--r-- | lib/IR/Function.cpp | 12 | ||||
| -rw-r--r-- | lib/IR/Makefile | 2 | ||||
| -rw-r--r-- | lib/Transforms/Instrumentation/MemorySanitizer.cpp | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/include/llvm/IR/CMakeLists.txt b/include/llvm/IR/CMakeLists.txt index a5a9f3957f..2d52a89f9c 100644 --- a/include/llvm/IR/CMakeLists.txt +++ b/include/llvm/IR/CMakeLists.txt @@ -3,5 +3,5 @@ set(LLVM_TARGET_DEFINITIONS Intrinsics.td) tablegen(LLVM Intrinsics.gen -gen-intrinsic) add_custom_target(intrinsics_gen ALL - DEPENDS ${llvm_builded_incs_dir}/Intrinsics.gen) + DEPENDS ${llvm_builded_incs_dir}/IR/Intrinsics.gen) set_target_properties(intrinsics_gen PROPERTIES FOLDER "Tablegenning") diff --git a/include/llvm/IR/Intrinsics.h b/include/llvm/IR/Intrinsics.h index c1fe4c67c4..1e20fd7ea8 100644 --- a/include/llvm/IR/Intrinsics.h +++ b/include/llvm/IR/Intrinsics.h @@ -38,7 +38,7 @@ namespace Intrinsic { // Get the intrinsic enums generated from Intrinsics.td #define GET_INTRINSIC_ENUM_VALUES -#include "llvm/Intrinsics.gen" +#include "llvm/IR/Intrinsics.gen" #undef GET_INTRINSIC_ENUM_VALUES , num_intrinsics }; diff --git a/lib/Analysis/BasicAliasAnalysis.cpp b/lib/Analysis/BasicAliasAnalysis.cpp index e715d76fbe..ca668b2310 100644 --- a/lib/Analysis/BasicAliasAnalysis.cpp +++ b/lib/Analysis/BasicAliasAnalysis.cpp @@ -631,7 +631,7 @@ BasicAliasAnalysis::getModRefBehavior(const Function *F) { // For intrinsics, we can check the table. if (unsigned iid = F->getIntrinsicID()) { #define GET_INTRINSIC_MODREF_BEHAVIOR -#include "llvm/Intrinsics.gen" +#include "llvm/IR/Intrinsics.gen" #undef GET_INTRINSIC_MODREF_BEHAVIOR } diff --git a/lib/IR/Function.cpp b/lib/IR/Function.cpp index cb675c23f7..317017a59b 100644 --- a/lib/IR/Function.cpp +++ b/lib/IR/Function.cpp @@ -332,7 +332,7 @@ unsigned Function::getIntrinsicID() const { const char *Name = ValName->getKeyData(); #define GET_FUNCTION_RECOGNIZER -#include "llvm/Intrinsics.gen" +#include "llvm/IR/Intrinsics.gen" #undef GET_FUNCTION_RECOGNIZER return 0; } @@ -342,7 +342,7 @@ std::string Intrinsic::getName(ID id, ArrayRef<Type*> Tys) { static const char * const Table[] = { "not_intrinsic", #define GET_INTRINSIC_NAME_TABLE -#include "llvm/Intrinsics.gen" +#include "llvm/IR/Intrinsics.gen" #undef GET_INTRINSIC_NAME_TABLE }; if (Tys.empty()) @@ -499,7 +499,7 @@ static void DecodeIITType(unsigned &NextElt, ArrayRef<unsigned char> Infos, #define GET_INTRINSIC_GENERATOR_GLOBAL -#include "llvm/Intrinsics.gen" +#include "llvm/IR/Intrinsics.gen" #undef GET_INTRINSIC_GENERATOR_GLOBAL void Intrinsic::getIntrinsicInfoTableEntries(ID id, @@ -596,13 +596,13 @@ FunctionType *Intrinsic::getType(LLVMContext &Context, bool Intrinsic::isOverloaded(ID id) { #define GET_INTRINSIC_OVERLOAD_TABLE -#include "llvm/Intrinsics.gen" +#include "llvm/IR/Intrinsics.gen" #undef GET_INTRINSIC_OVERLOAD_TABLE } /// This defines the "Intrinsic::getAttributes(ID id)" method. #define GET_INTRINSIC_ATTRIBUTES -#include "llvm/Intrinsics.gen" +#include "llvm/IR/Intrinsics.gen" #undef GET_INTRINSIC_ATTRIBUTES Function *Intrinsic::getDeclaration(Module *M, ID id, ArrayRef<Type*> Tys) { @@ -615,7 +615,7 @@ Function *Intrinsic::getDeclaration(Module *M, ID id, ArrayRef<Type*> Tys) { // This defines the "Intrinsic::getIntrinsicForGCCBuiltin()" method. #define GET_LLVM_INTRINSIC_FOR_GCC_BUILTIN -#include "llvm/Intrinsics.gen" +#include "llvm/IR/Intrinsics.gen" #undef GET_LLVM_INTRINSIC_FOR_GCC_BUILTIN /// hasAddressTaken - returns true if there are any uses of this function diff --git a/lib/IR/Makefile b/lib/IR/Makefile index 86d78f0629..cc403f38dd 100644 --- a/lib/IR/Makefile +++ b/lib/IR/Makefile @@ -23,7 +23,7 @@ $(ObjDir)/Intrinsics.gen.tmp: $(ObjDir)/.dir $(INTRINSICTDS) $(LLVM_TBLGEN) $(Echo) Building Intrinsics.gen.tmp from Intrinsics.td $(Verb) $(LLVMTableGen) $(call SYSPATH, $(INTRINSICTD)) -o $(call SYSPATH, $@) -gen-intrinsic -$(GENFILE): $(PROJ_OBJ_ROOT)/include/llvm/IR/.dir $(ObjDir)/Intrinsics.gen.tmp +$(GENFILE): $(ObjDir)/Intrinsics.gen.tmp $(PROJ_OBJ_ROOT)/include/llvm/IR/.dir $(Verb) $(CMP) -s $@ $< || ( $(CP) $< $@ && \ $(EchoCmd) Updated Intrinsics.gen because Intrinsics.gen.tmp \ changed significantly. ) diff --git a/lib/Transforms/Instrumentation/MemorySanitizer.cpp b/lib/Transforms/Instrumentation/MemorySanitizer.cpp index 8d3c22e18c..58d5801ea0 100644 --- a/lib/Transforms/Instrumentation/MemorySanitizer.cpp +++ b/lib/Transforms/Instrumentation/MemorySanitizer.cpp @@ -1278,7 +1278,7 @@ struct MemorySanitizerVisitor : public InstVisitor<MemorySanitizerVisitor> { const int UnknownModRefBehavior = IK_WritesMemory; #define GET_INTRINSIC_MODREF_BEHAVIOR #define ModRefBehavior IntrinsicKind -#include "llvm/Intrinsics.gen" +#include "llvm/IR/Intrinsics.gen" #undef ModRefBehavior #undef GET_INTRINSIC_MODREF_BEHAVIOR } |