Address review comments

Author: kovdan01

llvm/include/llvm/IR/DebugInfoMetadata.h

@@ -975,6 +975,12 @@ class DIDerivedType : public DIType {
 public:
   /// Pointer authentication (__ptrauth) metadata.
   struct PtrAuthData {
+    // RawData layout:
+    // - Bits 0..3:  Key
+    // - Bit  4:     IsAddressDiscriminated
+    // - Bits 5..20: ExtraDiscriminator
+    // - Bit  21:    IsaPointer
+    // - Bit  22:    AuthenticatesNullValues
     unsigned RawData;
 
     PtrAuthData(unsigned FromRawData) : RawData(FromRawData) {}
@@ -986,12 +992,6 @@ class DIDerivedType : public DIType {
                 (IsaPointer ? (1 << 21) : 0) |
                 (AuthenticatesNullValues ? (1 << 22) : 0);
     }
-    bool operator==(struct PtrAuthData Other) const {
-      return RawData == Other.RawData;
-    }
-    bool operator!=(struct PtrAuthData Other) const {
-      return !(*this == Other);
-    }
 
     unsigned Key() { return (RawData >> 0) & 0b1111; }
     bool IsAddressDiscriminated() { return (RawData >> 4) & 1; }
@@ -1090,37 +1090,6 @@ class DIDerivedType : public DIType {
 
   std::optional<PtrAuthData> getPtrAuthData() const;
 
-  /// \returns The PointerAuth key.
-  std::optional<unsigned> getPtrAuthKey() const {
-    if (auto PtrAuthData = getPtrAuthData())
-      return PtrAuthData->Key();
-    return std::nullopt;
-  }
-  /// \returns The PointerAuth address discrimination bit.
-  std::optional<bool> isPtrAuthAddressDiscriminated() const {
-    if (auto PtrAuthData = getPtrAuthData())
-      return PtrAuthData->IsAddressDiscriminated();
-    return std::nullopt;
-  }
-  /// \returns The PointerAuth extra discriminator.
-  std::optional<unsigned> getPtrAuthExtraDiscriminator() const {
-    if (auto PtrAuthData = getPtrAuthData())
-      return PtrAuthData->ExtraDiscriminator();
-    return std::nullopt;
-  }
-  /// \returns The PointerAuth IsaPointer bit.
-  std::optional<bool> isPtrAuthIsaPointer() const {
-    if (auto PtrAuthData = getPtrAuthData())
-      return PtrAuthData->IsaPointer();
-    return std::nullopt;
-  }
-  /// \returns The PointerAuth authenticates null values bit.
-  std::optional<bool> getPtrAuthAuthenticatesNullValues() const {
-    if (auto PtrAuthData = getPtrAuthData())
-      return PtrAuthData->AuthenticatesNullValues();
-    return std::nullopt;
-  }
-
   /// Get extra data associated with this derived type.
   ///
   /// Class type for pointer-to-members, objective-c property node for ivars,
@@ -1160,6 +1129,16 @@ class DIDerivedType : public DIType {
   }
 };
 
+inline bool operator==(DIDerivedType::PtrAuthData Lhs,
+                       DIDerivedType::PtrAuthData Rhs) {
+  return Lhs.RawData == Rhs.RawData;
+}
+
+inline bool operator!=(DIDerivedType::PtrAuthData Lhs,
+                       DIDerivedType::PtrAuthData Rhs) {
+  return !(Lhs == Rhs);
+}
+
 /// Composite types.
 ///
 /// TODO: Detach from DerivedTypeBase (split out MDEnumType?).

llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp

@@ -803,20 +803,18 @@ void DwarfUnit::constructTypeDIE(DIE &Buffer, const DIDerivedType *DTy) {
   if (DTy->getDWARFAddressSpace())
     addUInt(Buffer, dwarf::DW_AT_address_class, dwarf::DW_FORM_data4,
             *DTy->getDWARFAddressSpace());
-  if (auto Key = DTy->getPtrAuthKey())
-    addUInt(Buffer, dwarf::DW_AT_LLVM_ptrauth_key, dwarf::DW_FORM_data1, *Key);
-  if (auto AddrDisc = DTy->isPtrAuthAddressDiscriminated())
-    if (AddrDisc.value())
+  if (auto PtrAuthData = DTy->getPtrAuthData()) {
+    addUInt(Buffer, dwarf::DW_AT_LLVM_ptrauth_key, dwarf::DW_FORM_data1,
+            PtrAuthData->Key());
+    if (PtrAuthData->IsAddressDiscriminated())
       addFlag(Buffer, dwarf::DW_AT_LLVM_ptrauth_address_discriminated);
-  if (auto Disc = DTy->getPtrAuthExtraDiscriminator())
     addUInt(Buffer, dwarf::DW_AT_LLVM_ptrauth_extra_discriminator,
-            dwarf::DW_FORM_data2, *Disc);
-  if (auto IsaPointer = DTy->isPtrAuthIsaPointer())
-    if (*IsaPointer)
+            dwarf::DW_FORM_data2, PtrAuthData->ExtraDiscriminator());
+    if (PtrAuthData->IsaPointer())
       addFlag(Buffer, dwarf::DW_AT_LLVM_ptrauth_isa_pointer);
-  if (auto AuthenticatesNullValues = DTy->getPtrAuthAuthenticatesNullValues())
-    if (*AuthenticatesNullValues)
+    if (PtrAuthData->AuthenticatesNullValues())
       addFlag(Buffer, dwarf::DW_AT_LLVM_ptrauth_authenticates_null_values);
+  }
 }
 
 void DwarfUnit::constructSubprogramArguments(DIE &Buffer, DITypeRefArray Args) {

llvm/lib/IR/AsmWriter.cpp

@@ -2135,17 +2135,16 @@ static void writeDIDerivedType(raw_ostream &Out, const DIDerivedType *N,
     Printer.printInt("dwarfAddressSpace", *DWARFAddressSpace,
                      /* ShouldSkipZero */ false);
   Printer.printMetadata("annotations", N->getRawAnnotations());
-  if (auto Key = N->getPtrAuthKey())
-    Printer.printInt("ptrAuthKey", *Key);
-  if (auto AddrDisc = N->isPtrAuthAddressDiscriminated())
-    Printer.printBool("ptrAuthIsAddressDiscriminated", *AddrDisc);
-  if (auto Disc = N->getPtrAuthExtraDiscriminator())
-    Printer.printInt("ptrAuthExtraDiscriminator", *Disc);
-  if (auto IsaPointer = N->isPtrAuthIsaPointer())
-    Printer.printBool("ptrAuthIsaPointer", *IsaPointer);
-  if (auto AuthenticatesNullValues = N->getPtrAuthAuthenticatesNullValues())
+  if (auto PtrAuthData = N->getPtrAuthData()) {
+    Printer.printInt("ptrAuthKey", PtrAuthData->Key());
+    Printer.printBool("ptrAuthIsAddressDiscriminated",
+                      PtrAuthData->IsAddressDiscriminated());
+    Printer.printInt("ptrAuthExtraDiscriminator",
+                     PtrAuthData->ExtraDiscriminator());
+    Printer.printBool("ptrAuthIsaPointer", PtrAuthData->IsaPointer());
     Printer.printBool("ptrAuthAuthenticatesNullValues",
-                      *AuthenticatesNullValues);
+                      PtrAuthData->AuthenticatesNullValues());
+  }
   Out << ")";
 }
 

llvm/unittests/IR/MetadataTest.cpp

@@ -1975,9 +1975,9 @@ TEST_F(DIDerivedTypeTest, getWithLargeValues) {
       UINT64_MAX, UINT32_MAX - 1, UINT64_MAX - 2, UINT32_MAX - 3,
       DIDerivedType::PtrAuthData(7, true, 0xffff, true, false), Flags,
       ExtraData);
-  EXPECT_EQ(7U, *N1->getPtrAuthKey());
-  EXPECT_EQ(true, *N1->isPtrAuthAddressDiscriminated());
-  EXPECT_EQ(0xffffU, *N1->getPtrAuthExtraDiscriminator());
+  EXPECT_EQ(7U, N1->getPtrAuthData()->Key());
+  EXPECT_EQ(true, N1->getPtrAuthData()->IsAddressDiscriminated());
+  EXPECT_EQ(0xffffU, N1->getPtrAuthData()->ExtraDiscriminator());
 }
 
 typedef MetadataTest DICompositeTypeTest;