Simplify code

Author: MaskRay

lld/ELF/Config.h

@@ -137,7 +137,7 @@ enum LtoKind : uint8_t {UnifiedThin, UnifiedRegular, Default};
 enum class GcsPolicy { Implicit, Never, Always };
 
 // For -z gcs-report= and -zgcs-report-dynamic
-enum class GcsReportPolicy { None, Warning, Error, Unknown };
+enum class GcsReportPolicy { None, Warning, Error };
 
 struct SymbolVersion {
   llvm::StringRef name;
@@ -750,18 +750,6 @@ uint64_t errCount(Ctx &ctx);
 
 ELFSyncStream InternalErr(Ctx &ctx, const uint8_t *buf);
 
-inline StringRef gcsReportPolicytoString(GcsReportPolicy value) {
-  StringRef ret;
-  if (value == GcsReportPolicy::Warning)
-    ret = "warning";
-  else if (value == GcsReportPolicy::Error)
-    ret = "error";
-  else
-    ret = "none";
-
-  return ret;
-}
-
 #define CHECK2(E, S) lld::check2((E), [&] { return toStr(ctx, S); })
 
 } // namespace lld::elf

lld/ELF/Driver.cpp

@@ -578,31 +578,32 @@ static GcsPolicy getZGcs(Ctx &ctx, opt::InputArgList &args) {
 
 static void getZGcsReport(Ctx &ctx, opt::InputArgList &args) {
   bool reportDynamicDefined = false;
-
   for (auto *arg : args.filtered(OPT_z)) {
     std::pair<StringRef, StringRef> kv = StringRef(arg->getValue()).split('=');
-    if ((kv.first == "gcs-report") || kv.first == "gcs-report-dynamic") {
-      arg->claim();
-      GcsReportPolicy value = StringSwitch<GcsReportPolicy>(kv.second)
-                                  .Case("none", GcsReportPolicy::None)
-                                  .Case("warning", GcsReportPolicy::Warning)
-                                  .Case("error", GcsReportPolicy::Error)
-                                  .Default(GcsReportPolicy::Unknown);
-      if (value == GcsReportPolicy::Unknown)
-        ErrAlways(ctx) << "unknown -z " << kv.first << "= value: " << kv.second;
-
-      if (kv.first == "gcs-report")
-        ctx.arg.zGcsReport = value;
-      else if (kv.first == "gcs-report-dynamic") {
-        ctx.arg.zGcsReportDynamic = value;
-        reportDynamicDefined = true;
-      }
+    if (kv.first != "gcs-report" && kv.first != "gcs-report-dynamic")
+      continue;
+    arg->claim();
+    GcsReportPolicy value;
+    if (kv.second == "none")
+      value = GcsReportPolicy::None;
+    else if (kv.second == "warning")
+      value = GcsReportPolicy::Warning;
+    else if (kv.second == "error")
+      value = GcsReportPolicy::Error;
+    else {
+      ErrAlways(ctx) << "unknown -z " << kv.first << "= value: " << kv.second;
+      continue;
+    }
+    if (kv.first == "gcs-report") {
+      ctx.arg.zGcsReport = value;
+    } else if (kv.first == "gcs-report-dynamic") {
+      ctx.arg.zGcsReportDynamic = value;
+      reportDynamicDefined = true;
     }
   }
 
-  // The behaviour of -zgnu-report-dynamic matches that of GNU ld. When
-  // -zgcs-report is set to `warning` or `error`, -zgcs-report-dynamic will
-  // inherit this value if there is no user set value. This detects shared
+  // When -zgcs-report is set to `warning` or `error`, -zgcs-report-dynamic will
+  // inherit this value if unspecified, matching GNU ld. This detects shared
   // libraries without the GCS property but does not the shared-libraries to be
   // rebuilt for successful linking
   if (!reportDynamicDefined && ctx.arg.zGcsReport != GcsReportPolicy::None &&
@@ -1589,9 +1590,6 @@ static void readConfigs(Ctx &ctx, opt::InputArgList &args) {
   ctx.arg.zForceBti = hasZOption(args, "force-bti");
   ctx.arg.zForceIbt = hasZOption(args, "force-ibt");
   ctx.arg.zGcs = getZGcs(ctx, args);
-  // getZGcsReport assings the values for `ctx.arg.zGcsReport` and
-  // `ctx.arg.zGcsReportDynamic within the function. By doing this, it saves
-  // calling the function twice, as both values can be parsed at once.
   getZGcsReport(ctx, args);
   ctx.arg.zGlobal = hasZOption(args, "global");
   ctx.arg.zGnustack = getZGnuStack(args);
@@ -2827,6 +2825,17 @@ static void redirectSymbols(Ctx &ctx, ArrayRef<WrappedSymbol> wrapped) {
     ctx.symtab->wrap(w.sym, w.real, w.wrap);
 }
 
+static StringRef gcsReportPolicytoString(GcsReportPolicy value) {
+  StringRef ret;
+  if (value == GcsReportPolicy::Warning)
+    ret = "warning";
+  else if (value == GcsReportPolicy::Error)
+    ret = "error";
+  else
+    ret = "none";
+  return ret;
+}
+
 // To enable CET (x86's hardware-assisted control flow enforcement), each
 // source file must be compiled with -fcf-protection. Object files compiled
 // with the flag contain feature flags indicating that they are compatible

lld/ELF/InputFiles.cpp

@@ -919,13 +919,13 @@ void ObjFile<ELFT>::initializeSections(bool ignoreComdats,
 }
 
 template <typename ELFT>
-static void parseGnuPropertyNote(Ctx &ctx, uint32_t &featureAndType,
-                                 ArrayRef<uint8_t> &desc, ELFFileBase *f,
-                                 const uint8_t *base,
+static void parseGnuPropertyNote(Ctx &ctx, ELFFileBase &f,
+                                 uint32_t featureAndType,
+                                 ArrayRef<uint8_t> &desc, const uint8_t *base,
                                  ArrayRef<uint8_t> *data = nullptr) {
   auto err = [&](const uint8_t *place) -> ELFSyncStream {
     auto diag = Err(ctx);
-    diag << f->getName() << ":(" << ".note.gnu.property+0x"
+    diag << &f << ":(" << ".note.gnu.property+0x"
          << Twine::utohexstr(place - base) << "): ";
     return diag;
   };
@@ -946,15 +946,15 @@ static void parseGnuPropertyNote(Ctx &ctx, uint32_t &featureAndType,
       // accumulate the bits set.
       if (size < 4)
         return void(err(place) << "FEATURE_1_AND entry is too short");
-      f->andFeatures |= read32<ELFT::Endianness>(desc.data());
+      f.andFeatures |= read32<ELFT::Endianness>(desc.data());
     } else if (ctx.arg.emachine == EM_AARCH64 &&
                type == GNU_PROPERTY_AARCH64_FEATURE_PAUTH) {
       // If the file being parsed is a SharedFile, we cannot pass in
       // the data variable as there is no InputSection to collect the
       // data from. As such, these are ignored. They are needed either
       // when loading a shared library oject.
       ArrayRef<uint8_t> contents = data ? *data : desc;
-      if (!f->aarch64PauthAbiCoreInfo.empty()) {
+      if (!f.aarch64PauthAbiCoreInfo.empty()) {
         return void(
             err(contents.data())
             << "multiple GNU_PROPERTY_AARCH64_FEATURE_PAUTH entries are "
@@ -965,7 +965,7 @@ static void parseGnuPropertyNote(Ctx &ctx, uint32_t &featureAndType,
                        "is invalid: expected 16 bytes, but got "
                     << size);
       }
-      f->aarch64PauthAbiCoreInfo = desc;
+      f.aarch64PauthAbiCoreInfo = desc;
     }
 
     // Padding is present in the note descriptor, if necessary.
@@ -1010,7 +1010,7 @@ static void readGnuProperty(Ctx &ctx, const InputSection &sec,
     // Read a body of a NOTE record, which consists of type-length-value fields.
     ArrayRef<uint8_t> desc = note.getDesc(sec.addralign);
     const uint8_t *base = sec.content().data();
-    parseGnuPropertyNote<ELFT>(ctx, featureAndType, desc, &f, base, &data);
+    parseGnuPropertyNote<ELFT>(ctx, f, featureAndType, desc, base, &data);
 
     // Go to next NOTE record to look for more FEATURE_1_AND descriptions.
     data = data.slice(nhdr->getSize(sec.addralign));
@@ -1465,7 +1465,7 @@ void SharedFile::parseGnuAndFeatures(const uint8_t *base,
 
     // Read a body of a NOTE record, which consists of type-length-value fields.
     ArrayRef<uint8_t> desc = note.getDesc(headers[i].p_align);
-    parseGnuPropertyNote<ELFT>(ctx, featureAndType, desc, this, base);
+    parseGnuPropertyNote<ELFT>(ctx, *this, featureAndType, desc, base);
   }
 }