address comments

Author: paperchalice

llvm/lib/Target/ARM/ARMAsmPrinter.cpp

@@ -701,21 +701,14 @@ void ARMAsmPrinter::emitAttributes() {
                       ARMBuildAttrs::AddressDirect);
   }
 
-  Metadata *MDEx = nullptr;
-  Metadata *MDDM = nullptr;
-  Metadata *MDNM = nullptr;
-  if (const Module *M = MMI->getModule()) {
-    MDEx = M->getModuleFlag("arm-eabi-fp-exceptions");
-    MDDM = M->getModuleFlag("arm-eabi-fp-denormal");
-    MDNM = M->getModuleFlag("arm-eabi-fp-number-model");
-  }
-
   // Set FP Denormals.
-  if (auto *DM = mdconst::extract_or_null<ConstantInt>(MDDM))
-    ATS.emitAttribute(ARMBuildAttrs::ABI_FP_denormal, DM->getZExtValue());
-  else if (checkDenormalAttributeConsistency(*MMI->getModule(),
-                                             "denormal-fp-math",
-                                             DenormalMode::getPreserveSign()))
+  if (auto *DM = mdconst::extract_or_null<ConstantInt>(
+          MMI->getModule()->getModuleFlag("arm-eabi-fp-denormal"))) {
+    if (unsigned TagVal = DM->getZExtValue())
+      ATS.emitAttribute(ARMBuildAttrs::ABI_FP_denormal, TagVal);
+  } else if (checkDenormalAttributeConsistency(*MMI->getModule(),
+                                               "denormal-fp-math",
+                                               DenormalMode::getPreserveSign()))
     ATS.emitAttribute(ARMBuildAttrs::ABI_FP_denormal,
                       ARMBuildAttrs::PreserveFPSign);
   else if (checkDenormalAttributeConsistency(*MMI->getModule(),
@@ -755,11 +748,13 @@ void ARMAsmPrinter::emitAttributes() {
   }
 
   // Set FP exceptions and rounding
-  if (auto *Ex = mdconst::extract_or_null<ConstantInt>(MDEx))
-    ATS.emitAttribute(ARMBuildAttrs::ABI_FP_exceptions, Ex->getZExtValue());
-  else if (checkFunctionsAttributeConsistency(*MMI->getModule(),
-                                              "no-trapping-math", "true") ||
-           TM.Options.NoTrappingFPMath)
+  if (auto *Ex = mdconst::extract_or_null<ConstantInt>(
+          MMI->getModule()->getModuleFlag("arm-eabi-fp-exceptions"))) {
+    if (unsigned TagVal = Ex->getZExtValue())
+      ATS.emitAttribute(ARMBuildAttrs::ABI_FP_exceptions, TagVal);
+  } else if (checkFunctionsAttributeConsistency(*MMI->getModule(),
+                                                "no-trapping-math", "true") ||
+             TM.Options.NoTrappingFPMath)
     ATS.emitAttribute(ARMBuildAttrs::ABI_FP_exceptions,
                       ARMBuildAttrs::Not_Allowed);
   else {
@@ -773,9 +768,11 @@ void ARMAsmPrinter::emitAttributes() {
 
   // TM.Options.NoInfsFPMath && TM.Options.NoNaNsFPMath is the
   // equivalent of GCC's -ffinite-math-only flag.
-  if (auto *NM = mdconst::extract_or_null<ConstantInt>(MDNM))
-    ATS.emitAttribute(ARMBuildAttrs::ABI_FP_number_model, NM->getZExtValue());
-  else if (TM.Options.NoInfsFPMath && TM.Options.NoNaNsFPMath)
+  if (auto *NumModel = mdconst::extract_or_null<ConstantInt>(
+          MMI->getModule()->getModuleFlag("arm-eabi-fp-number-model"))) {
+    if (unsigned TagVal = NumModel->getZExtValue())
+      ATS.emitAttribute(ARMBuildAttrs::ABI_FP_number_model, TagVal);
+  } else if (TM.Options.NoInfsFPMath && TM.Options.NoNaNsFPMath)
     ATS.emitAttribute(ARMBuildAttrs::ABI_FP_number_model,
                       ARMBuildAttrs::Allowed);
   else

llvm/test/CodeGen/ARM/build-attributes-fn-attr4.ll

@@ -6,7 +6,7 @@
 
 ; RUN: llc < %s -mtriple=armv7-linux-gnueabi -mcpu=cortex-a15  | FileCheck %s
 
-; CHECK: .eabi_attribute 20, 0
+; CHECK-NOT: .eabi_attribute 20
 
 define i32 @foo1() local_unnamed_addr #0 {
 entry: