Move -z execute-only-report checking into Writer.cpp

Author: Il-Capitano

lld/ELF/Driver.cpp

@@ -2930,36 +2930,6 @@ static void readSecurityNotes(Ctx &ctx) {
     ctx.arg.andFeatures &= ~GNU_PROPERTY_AARCH64_FEATURE_1_GCS;
 }
 
-static void checkExecuteOnly(Ctx &ctx) {
-  if (ctx.arg.emachine != EM_AARCH64)
-    return;
-
-  auto reportUnless = [&](StringRef config, bool cond) -> ELFSyncStream {
-    if (cond)
-      return {ctx, DiagLevel::None};
-    if (config == "error")
-      return {ctx, DiagLevel::Err};
-    if (config == "warning")
-      return {ctx, DiagLevel::Warn};
-    return {ctx, DiagLevel::None};
-  };
-
-  for (ELFFileBase *file : ctx.objectFiles) {
-    for (InputSectionBase *sec : file->getSections()) {
-      if (!(sec && sec->flags & SHF_EXECINSTR))
-        continue;
-
-      OutputSection *osec = sec->getOutputSection();
-      if (osec && osec->name == ".text") {
-        reportUnless(ctx.arg.zExecuteOnlyReport,
-                     sec->flags & SHF_AARCH64_PURECODE)
-            << "-z execute-only-report: " << sec
-            << " does not have SHF_AARCH64_PURECODE flag set";
-      }
-    }
-  }
-}
-
 static void initSectionsAndLocalSyms(ELFFileBase *file, bool ignoreComdats) {
   switch (file->ekind) {
   case ELF32LEKind:
@@ -3325,8 +3295,6 @@ template <class ELFT> void LinkerDriver::link(opt::InputArgList &args) {
     ctx.script->addOrphanSections();
   }
 
-  checkExecuteOnly(ctx);
-
   {
     llvm::TimeTraceScope timeScope("Merge/finalize input sections");
 

lld/ELF/Writer.cpp

@@ -64,6 +64,7 @@ template <class ELFT> class Writer {
   void sortOrphanSections();
   void finalizeSections();
   void checkExecuteOnly();
+  void checkExecuteOnlyReport();
   void setReservedSymbolSections();
 
   SmallVector<std::unique_ptr<PhdrEntry>, 0> createPhdrs(Partition &part);
@@ -325,6 +326,7 @@ template <class ELFT> void Writer<ELFT>::run() {
   // finalizeSections does that.
   finalizeSections();
   checkExecuteOnly();
+  checkExecuteOnlyReport();
 
   // If --compressed-debug-sections is specified, compress .debug_* sections.
   // Do it right now because it changes the size of output sections.
@@ -2179,6 +2181,34 @@ template <class ELFT> void Writer<ELFT>::checkExecuteOnly() {
                             "data and code";
 }
 
+// Check that all input sections of .text have the SHF_AARCH64_PURECODE section
+// flag set.
+template <class ELFT> void Writer<ELFT>::checkExecuteOnlyReport() {
+  if (ctx.arg.emachine != EM_AARCH64 || ctx.arg.zExecuteOnlyReport == "none")
+    return;
+
+  auto reportUnless = [&](StringRef config, bool cond) -> ELFSyncStream {
+    if (cond)
+      return {ctx, DiagLevel::None};
+    if (config == "error")
+      return {ctx, DiagLevel::Err};
+    if (config == "warning")
+      return {ctx, DiagLevel::Warn};
+    return {ctx, DiagLevel::None};
+  };
+
+  SmallVector<InputSection *, 0> storage;
+  for (OutputSection *osec : ctx.outputSections) {
+    if (osec->name != ".text")
+      continue;
+    for (InputSection *sec : getInputSections(*osec, storage))
+      reportUnless(ctx.arg.zExecuteOnlyReport,
+                   sec->flags & SHF_AARCH64_PURECODE)
+          << "-z execute-only-report: " << sec
+          << " does not have SHF_AARCH64_PURECODE flag set";
+  }
+}
+
 // The linker is expected to define SECNAME_start and SECNAME_end
 // symbols for a few sections. This function defines them.
 template <class ELFT> void Writer<ELFT>::addStartEndSymbols() {