Address review feedback from MaskRay

Author: Il-Capitano

lld/ELF/Driver.cpp

@@ -1644,9 +1644,9 @@ static void readConfigs(Ctx &ctx, opt::InputArgList &args) {
   auto reports = {
       std::make_pair("bti-report", &ctx.arg.zBtiReport),
       std::make_pair("cet-report", &ctx.arg.zCetReport),
+      std::make_pair("execute-only-report", &ctx.arg.zExecuteOnlyReport),
       std::make_pair("gcs-report", &ctx.arg.zGcsReport),
-      std::make_pair("pauth-report", &ctx.arg.zPauthReport),
-      std::make_pair("execute-only-report", &ctx.arg.zExecuteOnlyReport)};
+      std::make_pair("pauth-report", &ctx.arg.zPauthReport)};
   for (opt::Arg *arg : args.filtered(OPT_z)) {
     std::pair<StringRef, StringRef> option =
         StringRef(arg->getValue()).split('=');
@@ -2945,15 +2945,15 @@ static void checkExecuteOnly(Ctx &ctx) {
   };
 
   for (ELFFileBase *file : ctx.objectFiles) {
-    for (InputSectionBase *section : file->getSections()) {
-      if (!(section && section->flags & SHF_EXECINSTR))
+    for (InputSectionBase *sec : file->getSections()) {
+      if (!(sec && sec->flags & SHF_EXECINSTR))
         continue;
 
-      OutputSection *outputSection = section->getOutputSection();
-      if (outputSection && outputSection->name == ".text") {
+      OutputSection *osec = sec->getOutputSection();
+      if (osec && osec->name == ".text") {
         reportUnless(ctx.arg.zExecuteOnlyReport,
-                     section->flags & SHF_AARCH64_PURECODE)
-            << file << ": -z execute-only-report: section " << section->name
+                     sec->flags & SHF_AARCH64_PURECODE)
+            << "-z execute-only-report: " << sec
             << " does not have SHF_AARCH64_PURECODE flag set";
       }
     }

lld/ELF/OutputSections.cpp

@@ -42,8 +42,10 @@ using namespace lld::elf;
 
 uint32_t OutputSection::getPhdrFlags() const {
   uint32_t ret = 0;
-  if ((ctx.arg.emachine != EM_ARM || !(flags & SHF_ARM_PURECODE)) &&
-      (ctx.arg.emachine != EM_AARCH64 || !(flags & SHF_AARCH64_PURECODE)))
+  bool purecode =
+      (ctx.arg.emachine == EM_ARM && (flags & SHF_ARM_PURECODE)) ||
+      (ctx.arg.emachine == EM_AARCH64 && (flags & SHF_AARCH64_PURECODE));
+  if (!purecode)
     ret |= PF_R;
   if (flags & SHF_WRITE)
     ret |= PF_W;

lld/test/ELF/aarch64-execute-only-report.s

@@ -7,8 +7,8 @@
 // RUN: not ld.lld -z execute-only-report=error %t.o -o /dev/null 2>&1 \
 // RUN:     | FileCheck --check-prefix=ERROR %s
 
-// WARNING: warning: {{.*}}.o: -z execute-only-report: section .text does not have SHF_AARCH64_PURECODE flag set
-// ERROR: error: {{.*}}.o: -z execute-only-report: section .text does not have SHF_AARCH64_PURECODE flag set
+// WARNING: warning: -z execute-only-report: {{.*}}.o:(.text) does not have SHF_AARCH64_PURECODE flag set
+// ERROR: error: -z execute-only-report: {{.*}}.o:(.text) does not have SHF_AARCH64_PURECODE flag set
 
         .section .text,"ax"
         .globl _start