diff options
author | Nico Weber <nicolasweber@gmx.de> | 2018-04-25 17:07:46 +0000 |
---|---|---|
committer | Nico Weber <nicolasweber@gmx.de> | 2018-04-25 17:07:46 +0000 |
commit | 79c6ec484eb0a6dcf9b0aec92174745f094e8d23 (patch) | |
tree | 3bbc27c54fed53559d0338639be39fdb9ef69cc6 | |
parent | b6dcc57ad12c658c18c5536119a52f54c06b9429 (diff) | |
download | bcm5719-llvm-79c6ec484eb0a6dcf9b0aec92174745f094e8d23.tar.gz bcm5719-llvm-79c6ec484eb0a6dcf9b0aec92174745f094e8d23.zip |
Rename Attributes.gen, Intrinsics.gen to Attributes.inc, Intrinsics.inc
Virtually all other tablegen outputs are called .inc, not .gen, so rename these two too for consistency.
No behavior change.
https://reviews.llvm.org/D46058
llvm-svn: 330843
-rw-r--r-- | llvm/cmake/modules/AddLLVM.cmake | 6 | ||||
-rw-r--r-- | llvm/include/llvm/IR/Attributes.h | 2 | ||||
-rw-r--r-- | llvm/include/llvm/IR/CMakeLists.txt | 4 | ||||
-rw-r--r-- | llvm/include/llvm/IR/Intrinsics.h | 2 | ||||
-rw-r--r-- | llvm/lib/IR/Function.cpp | 14 |
5 files changed, 14 insertions, 14 deletions
diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake index 2f470105ff5..08e0e77998b 100644 --- a/llvm/cmake/modules/AddLLVM.cmake +++ b/llvm/cmake/modules/AddLLVM.cmake @@ -1614,10 +1614,10 @@ function(setup_dependency_debugging name) return() endif() - set(deny_attributes_gen "(deny file* (literal \"${LLVM_BINARY_DIR}/include/llvm/IR/Attributes.gen\"))") - set(deny_intrinsics_gen "(deny file* (literal \"${LLVM_BINARY_DIR}/include/llvm/IR/Intrinsics.gen\"))") + set(deny_attributes_inc "(deny file* (literal \"${LLVM_BINARY_DIR}/include/llvm/IR/Attributes.inc\"))") + set(deny_intrinsics_inc "(deny file* (literal \"${LLVM_BINARY_DIR}/include/llvm/IR/Intrinsics.inc\"))") - set(sandbox_command "sandbox-exec -p '(version 1) (allow default) ${deny_attributes_gen} ${deny_intrinsics_gen}'") + set(sandbox_command "sandbox-exec -p '(version 1) (allow default) ${deny_attributes_inc} ${deny_intrinsics_inc}'") set_target_properties(${name} PROPERTIES RULE_LAUNCH_COMPILE ${sandbox_command}) endfunction() diff --git a/llvm/include/llvm/IR/Attributes.h b/llvm/include/llvm/IR/Attributes.h index 660fc589ddb..f92a06cfbb9 100644 --- a/llvm/include/llvm/IR/Attributes.h +++ b/llvm/include/llvm/IR/Attributes.h @@ -70,7 +70,7 @@ public: // IR-Level Attributes None, ///< No attributes have been set #define GET_ATTR_ENUM - #include "llvm/IR/Attributes.gen" + #include "llvm/IR/Attributes.inc" EndAttrKinds ///< Sentinal value useful for loops }; diff --git a/llvm/include/llvm/IR/CMakeLists.txt b/llvm/include/llvm/IR/CMakeLists.txt index cf75d5800b7..7c4d3e83d26 100644 --- a/llvm/include/llvm/IR/CMakeLists.txt +++ b/llvm/include/llvm/IR/CMakeLists.txt @@ -1,6 +1,6 @@ set(LLVM_TARGET_DEFINITIONS Attributes.td) -tablegen(LLVM Attributes.gen -gen-attrs) +tablegen(LLVM Attributes.inc -gen-attrs) set(LLVM_TARGET_DEFINITIONS Intrinsics.td) -tablegen(LLVM Intrinsics.gen -gen-intrinsic) +tablegen(LLVM Intrinsics.inc -gen-intrinsic) add_public_tablegen_target(intrinsics_gen) diff --git a/llvm/include/llvm/IR/Intrinsics.h b/llvm/include/llvm/IR/Intrinsics.h index fc79da7ae0e..d47c91fd6b9 100644 --- a/llvm/include/llvm/IR/Intrinsics.h +++ b/llvm/include/llvm/IR/Intrinsics.h @@ -39,7 +39,7 @@ namespace Intrinsic { // Get the intrinsic enums generated from Intrinsics.td #define GET_INTRINSIC_ENUM_VALUES -#include "llvm/IR/Intrinsics.gen" +#include "llvm/IR/Intrinsics.inc" #undef GET_INTRINSIC_ENUM_VALUES , num_intrinsics }; diff --git a/llvm/lib/IR/Function.cpp b/llvm/lib/IR/Function.cpp index be50f623c91..dfe50f60a8f 100644 --- a/llvm/lib/IR/Function.cpp +++ b/llvm/lib/IR/Function.cpp @@ -479,13 +479,13 @@ void Function::copyAttributesFrom(const Function *Src) { static const char * const IntrinsicNameTable[] = { "not_intrinsic", #define GET_INTRINSIC_NAME_TABLE -#include "llvm/IR/Intrinsics.gen" +#include "llvm/IR/Intrinsics.inc" #undef GET_INTRINSIC_NAME_TABLE }; /// Table of per-target intrinsic name tables. #define GET_INTRINSIC_TARGET_DATA -#include "llvm/IR/Intrinsics.gen" +#include "llvm/IR/Intrinsics.inc" #undef GET_INTRINSIC_TARGET_DATA /// Find the segment of \c IntrinsicNameTable for intrinsics with the same @@ -832,7 +832,7 @@ static void DecodeIITType(unsigned &NextElt, ArrayRef<unsigned char> Infos, } #define GET_INTRINSIC_GENERATOR_GLOBAL -#include "llvm/IR/Intrinsics.gen" +#include "llvm/IR/Intrinsics.inc" #undef GET_INTRINSIC_GENERATOR_GLOBAL void Intrinsic::getIntrinsicInfoTableEntries(ID id, @@ -969,7 +969,7 @@ FunctionType *Intrinsic::getType(LLVMContext &Context, bool Intrinsic::isOverloaded(ID id) { #define GET_INTRINSIC_OVERLOAD_TABLE -#include "llvm/IR/Intrinsics.gen" +#include "llvm/IR/Intrinsics.inc" #undef GET_INTRINSIC_OVERLOAD_TABLE } @@ -987,7 +987,7 @@ bool Intrinsic::isLeaf(ID id) { /// This defines the "Intrinsic::getAttributes(ID id)" method. #define GET_INTRINSIC_ATTRIBUTES -#include "llvm/IR/Intrinsics.gen" +#include "llvm/IR/Intrinsics.inc" #undef GET_INTRINSIC_ATTRIBUTES Function *Intrinsic::getDeclaration(Module *M, ID id, ArrayRef<Type*> Tys) { @@ -1000,12 +1000,12 @@ 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/IR/Intrinsics.gen" +#include "llvm/IR/Intrinsics.inc" #undef GET_LLVM_INTRINSIC_FOR_GCC_BUILTIN // This defines the "Intrinsic::getIntrinsicForMSBuiltin()" method. #define GET_LLVM_INTRINSIC_FOR_MS_BUILTIN -#include "llvm/IR/Intrinsics.gen" +#include "llvm/IR/Intrinsics.inc" #undef GET_LLVM_INTRINSIC_FOR_MS_BUILTIN bool Intrinsic::matchIntrinsicType(Type *Ty, ArrayRef<Intrinsic::IITDescriptor> &Infos, |