@@ -1044,17 +1044,14 @@ void CodeGenModule::Release() {
1044
1044
llvm::MDString::get (VMContext, " ascii" ));
1045
1045
}
1046
1046
1047
- llvm::Triple::ArchType Arch = Context.getTargetInfo ().getTriple ().getArch ();
1048
- if ( Arch == llvm::Triple::arm
1049
- || Arch == llvm::Triple::armeb
1050
- || Arch == llvm::Triple::thumb
1051
- || Arch == llvm::Triple::thumbeb) {
1047
+ llvm::Triple T = Context.getTargetInfo ().getTriple ();
1048
+ if (T.isARM () || T.isThumb ()) {
1052
1049
// The minimum width of an enum in bytes
1053
1050
uint64_t EnumWidth = Context.getLangOpts ().ShortEnums ? 1 : 4 ;
1054
1051
getModule ().addModuleFlag (llvm::Module::Error, " min_enum_size" , EnumWidth);
1055
1052
}
1056
1053
1057
- if (Arch == llvm::Triple::riscv32 || Arch == llvm::Triple::riscv64 ) {
1054
+ if (T. isRISCV () ) {
1058
1055
StringRef ABIStr = Target.getABI ();
1059
1056
llvm::LLVMContext &Ctx = TheModule.getContext ();
1060
1057
getModule ().addModuleFlag (llvm::Module::Error, " target-abi" ,
@@ -1127,10 +1124,7 @@ void CodeGenModule::Release() {
1127
1124
getModule ().addModuleFlag (llvm::Module::Override,
1128
1125
" tag-stack-memory-buildattr" , 1 );
1129
1126
1130
- if (Arch == llvm::Triple::thumb || Arch == llvm::Triple::thumbeb ||
1131
- Arch == llvm::Triple::arm || Arch == llvm::Triple::armeb ||
1132
- Arch == llvm::Triple::aarch64 || Arch == llvm::Triple::aarch64_32 ||
1133
- Arch == llvm::Triple::aarch64_be) {
1127
+ if (T.isARM () || T.isThumb () || T.isAArch64 ()) {
1134
1128
if (LangOpts.BranchTargetEnforcement )
1135
1129
getModule ().addModuleFlag (llvm::Module::Min, " branch-target-enforcement" ,
1136
1130
1 );
0 commit comments