Address review comments

Author: kovdan01

llvm/include/llvm/IR/DebugInfoMetadata.h

@@ -993,11 +993,11 @@ class DIDerivedType : public DIType {
                 (AuthenticatesNullValues ? (1 << 22) : 0);
     }
 
-    unsigned Key() { return (RawData >> 0) & 0b1111; }
-    bool IsAddressDiscriminated() { return (RawData >> 4) & 1; }
-    unsigned ExtraDiscriminator() { return (RawData >> 5) & 0xffff; }
-    bool IsaPointer() { return (RawData >> 21) & 1; }
-    bool AuthenticatesNullValues() { return (RawData >> 22) & 1; }
+    unsigned key() { return (RawData >> 0) & 0b1111; }
+    bool isAddressDiscriminated() { return (RawData >> 4) & 1; }
+    unsigned extraDiscriminator() { return (RawData >> 5) & 0xffff; }
+    bool isaPointer() { return (RawData >> 21) & 1; }
+    bool authenticatesNullValues() { return (RawData >> 22) & 1; }
   };
 
 private:

llvm/lib/AsmParser/LLParser.cpp

@@ -5163,7 +5163,7 @@ bool LLParser::parseDIDerivedType(MDNode *&Result, bool IsDistinct) {
     DWARFAddressSpace = dwarfAddressSpace.Val;
   std::optional<DIDerivedType::PtrAuthData> PtrAuthData;
   if (ptrAuthKey.Val)
-    PtrAuthData = DIDerivedType::PtrAuthData(
+    PtrAuthData.emplace(
         (unsigned)ptrAuthKey.Val, ptrAuthIsAddressDiscriminated.Val,
         (unsigned)ptrAuthExtraDiscriminator.Val, ptrAuthIsaPointer.Val,
         ptrAuthAuthenticatesNullValues.Val);

llvm/lib/Bitcode/Reader/MetadataLoader.cpp

@@ -1574,9 +1574,8 @@ Error MetadataLoader::MetadataLoaderImpl::parseOneMetadata(
     if (Record.size() > 14) {
       if (Record[13])
         Annotations = getMDOrNull(Record[13]);
-
       if (Record[14])
-        PtrAuthData = DIDerivedType::PtrAuthData(Record[14]);
+        PtrAuthData.emplace(Record[14]);
     }
 
     IsDistinct = Record[0];

llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp

@@ -805,14 +805,14 @@ void DwarfUnit::constructTypeDIE(DIE &Buffer, const DIDerivedType *DTy) {
             *DTy->getDWARFAddressSpace());
   if (auto PtrAuthData = DTy->getPtrAuthData()) {
     addUInt(Buffer, dwarf::DW_AT_LLVM_ptrauth_key, dwarf::DW_FORM_data1,
-            PtrAuthData->Key());
-    if (PtrAuthData->IsAddressDiscriminated())
+            PtrAuthData->key());
+    if (PtrAuthData->isAddressDiscriminated())
       addFlag(Buffer, dwarf::DW_AT_LLVM_ptrauth_address_discriminated);
     addUInt(Buffer, dwarf::DW_AT_LLVM_ptrauth_extra_discriminator,
-            dwarf::DW_FORM_data2, PtrAuthData->ExtraDiscriminator());
-    if (PtrAuthData->IsaPointer())
+            dwarf::DW_FORM_data2, PtrAuthData->extraDiscriminator());
+    if (PtrAuthData->isaPointer())
       addFlag(Buffer, dwarf::DW_AT_LLVM_ptrauth_isa_pointer);
-    if (PtrAuthData->AuthenticatesNullValues())
+    if (PtrAuthData->authenticatesNullValues())
       addFlag(Buffer, dwarf::DW_AT_LLVM_ptrauth_authenticates_null_values);
   }
 }

llvm/lib/IR/AsmWriter.cpp

@@ -2136,14 +2136,14 @@ static void writeDIDerivedType(raw_ostream &Out, const DIDerivedType *N,
                      /* ShouldSkipZero */ false);
   Printer.printMetadata("annotations", N->getRawAnnotations());
   if (auto PtrAuthData = N->getPtrAuthData()) {
-    Printer.printInt("ptrAuthKey", PtrAuthData->Key());
+    Printer.printInt("ptrAuthKey", PtrAuthData->key());
     Printer.printBool("ptrAuthIsAddressDiscriminated",
-                      PtrAuthData->IsAddressDiscriminated());
+                      PtrAuthData->isAddressDiscriminated());
     Printer.printInt("ptrAuthExtraDiscriminator",
-                     PtrAuthData->ExtraDiscriminator());
-    Printer.printBool("ptrAuthIsaPointer", PtrAuthData->IsaPointer());
+                     PtrAuthData->extraDiscriminator());
+    Printer.printBool("ptrAuthIsaPointer", PtrAuthData->isaPointer());
     Printer.printBool("ptrAuthAuthenticatesNullValues",
-                      PtrAuthData->AuthenticatesNullValues());
+                      PtrAuthData->authenticatesNullValues());
   }
   Out << ")";
 }

llvm/lib/IR/DIBuilder.cpp

@@ -303,13 +303,13 @@ DIDerivedType *DIBuilder::createPtrAuthQualifiedType(
     DIType *FromTy, unsigned Key, bool IsAddressDiscriminated,
     unsigned ExtraDiscriminator, bool IsaPointer,
     bool AuthenticatesNullValues) {
-  return DIDerivedType::get(
-      VMContext, dwarf::DW_TAG_LLVM_ptrauth_type, "", nullptr, 0, nullptr,
-      FromTy, 0, 0, 0, std::nullopt,
-      std::optional<DIDerivedType::PtrAuthData>({Key, IsAddressDiscriminated,
-                                                 ExtraDiscriminator, IsaPointer,
-                                                 AuthenticatesNullValues}),
-      DINode::FlagZero);
+  return DIDerivedType::get(VMContext, dwarf::DW_TAG_LLVM_ptrauth_type, "",
+                            nullptr, 0, nullptr, FromTy, 0, 0, 0, std::nullopt,
+                            std::optional<DIDerivedType::PtrAuthData>(
+                                std::in_place, Key, IsAddressDiscriminated,
+                                ExtraDiscriminator, IsaPointer,
+                                AuthenticatesNullValues),
+                            DINode::FlagZero);
 }
 
 DIDerivedType *

llvm/test/DebugInfo/AArch64/ptrauth.ll

@@ -41,7 +41,7 @@
 
 target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
 
-@p = common global i8* null, align 8, !dbg !0
+@p = global ptr null, align 8, !dbg !0
 
 !llvm.dbg.cu = !{!10}
 !llvm.module.flags = !{!19, !20}

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->getPtrAuthData()->Key());
-  EXPECT_EQ(true, N1->getPtrAuthData()->IsAddressDiscriminated());
-  EXPECT_EQ(0xffffU, N1->getPtrAuthData()->ExtraDiscriminator());
+  EXPECT_EQ(7U, N1->getPtrAuthData()->key());
+  EXPECT_EQ(true, N1->getPtrAuthData()->isAddressDiscriminated());
+  EXPECT_EQ(0xffffU, N1->getPtrAuthData()->extraDiscriminator());
 }
 
 typedef MetadataTest DICompositeTypeTest;