Address general code review feedback

- Remove redundant include
- Rename fields in AArch64PauthAbiCoreInfo
- Simplify assignment using direct initialization

Author: sivan-shani

lld/ELF/Arch/AArch64.cpp

@@ -1045,8 +1045,8 @@ AArch64BtiPac::AArch64BtiPac(Ctx &ctx) : AArch64(ctx) {
 
   if (ctx.arg.zPacPlt) {
     if (ctx.aarch64PauthAbiCoreInfo.has_value() &&
-        (ctx.aarch64PauthAbiCoreInfo->aarch64PauthAbiPlatform != 0 ||
-         ctx.aarch64PauthAbiCoreInfo->aarch64PauthAbiVersion != 0))
+        (ctx.aarch64PauthAbiCoreInfo->platform != 0 ||
+         ctx.aarch64PauthAbiCoreInfo->version != 0))
       pacEntryKind = PEK_Auth;
     else
       pacEntryKind = PEK_AuthHint;

lld/ELF/Config.h

@@ -29,7 +29,6 @@
 #include "llvm/Support/GlobPattern.h"
 #include "llvm/Support/TarWriter.h"
 #include <atomic>
-#include <cstdint>
 #include <memory>
 #include <mutex>
 #include <optional>
@@ -141,8 +140,8 @@ enum class GcsPolicy { Implicit, Never, Always };
 enum class ReportPolicy { None, Warning, Error };
 
 struct AArch64PauthAbiCoreInfo {
-  uint64_t aarch64PauthAbiPlatform;
-  uint64_t aarch64PauthAbiVersion;
+  uint64_t platform;
+  uint64_t version;
 };
 
 struct SymbolVersion {

lld/ELF/Driver.cpp

@@ -2848,10 +2848,9 @@ static void readSecurityNotes(Ctx &ctx) {
       referenceFileName = (*it)->getName();
     }
   }
-  bool hasValidPauthAbiCoreInfo =
-      ctx.aarch64PauthAbiCoreInfo.has_value() &&
-      (ctx.aarch64PauthAbiCoreInfo->aarch64PauthAbiPlatform != 0 ||
-       ctx.aarch64PauthAbiCoreInfo->aarch64PauthAbiVersion != 0);
+  bool hasValidPauthAbiCoreInfo = ctx.aarch64PauthAbiCoreInfo.has_value() &&
+                                  (ctx.aarch64PauthAbiCoreInfo->platform != 0 ||
+                                   ctx.aarch64PauthAbiCoreInfo->version != 0);
 
   auto report = [&](ReportPolicy policy) -> ELFSyncStream {
     return {ctx, toDiagLevel(policy)};
@@ -2923,24 +2922,24 @@ static void readSecurityNotes(Ctx &ctx) {
       continue;
     }
 
-    if (ctx.aarch64PauthAbiCoreInfo->aarch64PauthAbiPlatform !=
-        f->aarch64PauthAbiCoreInfo->aarch64PauthAbiPlatform)
+    if (ctx.aarch64PauthAbiCoreInfo->platform !=
+        f->aarch64PauthAbiCoreInfo->platform)
       Err(ctx) << "incompatible AArch64 PAuth Platform Values\n>>> "
                << referenceFileName << ": 0x"
-               << toHex(ctx.aarch64PauthAbiCoreInfo->aarch64PauthAbiPlatform,
+               << toHex(ctx.aarch64PauthAbiCoreInfo->platform,
                         /*LowerCase=*/true)
                << "\n>>> " << f << ": 0x"
-               << toHex(f->aarch64PauthAbiCoreInfo->aarch64PauthAbiPlatform,
+               << toHex(f->aarch64PauthAbiCoreInfo->platform,
                         /*LowerCase=*/true);
 
-    if (ctx.aarch64PauthAbiCoreInfo->aarch64PauthAbiVersion !=
-        f->aarch64PauthAbiCoreInfo->aarch64PauthAbiVersion)
+    if (ctx.aarch64PauthAbiCoreInfo->version !=
+        f->aarch64PauthAbiCoreInfo->version)
       Err(ctx) << "incompatible AArch64 PAuth Version Values\n>>> "
                << referenceFileName << ": 0x"
-               << toHex(ctx.aarch64PauthAbiCoreInfo->aarch64PauthAbiVersion,
+               << toHex(ctx.aarch64PauthAbiCoreInfo->version,
                         /*LowerCase=*/true)
                << "\n>>> " << f << ": 0x"
-               << toHex(f->aarch64PauthAbiCoreInfo->aarch64PauthAbiVersion,
+               << toHex(f->aarch64PauthAbiCoreInfo->version,
                         /*LowerCase=*/true);
   }
 

lld/ELF/InputFiles.cpp

@@ -961,11 +961,9 @@ static void parseGnuPropertyNote(Ctx &ctx, ELFFileBase &f,
                        "is invalid: expected 16 bytes, but got "
                     << size);
       }
-      f.aarch64PauthAbiCoreInfo.emplace();
-      f.aarch64PauthAbiCoreInfo->aarch64PauthAbiPlatform =
-          support::endian::read64<ELFT::Endianness>(&desc[0]);
-      f.aarch64PauthAbiCoreInfo->aarch64PauthAbiVersion =
-          support::endian::read64<ELFT::Endianness>(&desc[8]);
+      f.aarch64PauthAbiCoreInfo = {
+          support::endian::read64<ELFT::Endianness>(&desc[0]),
+          support::endian::read64<ELFT::Endianness>(&desc[8])};
     }
 
     // Padding is present in the note descriptor, if necessary.

lld/ELF/SyntheticSections.cpp

@@ -347,10 +347,8 @@ void GnuPropertySection::writeTo(uint8_t *buf) {
   if (ctx.aarch64PauthAbiCoreInfo) {
     write32(ctx, buf + offset + 0, GNU_PROPERTY_AARCH64_FEATURE_PAUTH);
     write32(ctx, buf + offset + 4, sizeof(uint64_t) * 2);
-    write64(ctx, buf + offset + 8,
-            ctx.aarch64PauthAbiCoreInfo->aarch64PauthAbiPlatform);
-    write64(ctx, buf + offset + 16,
-            ctx.aarch64PauthAbiCoreInfo->aarch64PauthAbiVersion);
+    write64(ctx, buf + offset + 8, ctx.aarch64PauthAbiCoreInfo->platform);
+    write64(ctx, buf + offset + 16, ctx.aarch64PauthAbiCoreInfo->version);
   }
 }