[llvm] [llvm][MetadataLoader] Make sure we correctly load DW_APPLE_ENUM_KIND from bitcode (PR #132374)

[Michael Buch via llvm-commits]

https://github.com/Michael137 updated https://github.com/llvm/llvm-project/pull/132374

>From bf49ba31515253564e57c444aca25096037028e9 Mon Sep 17 00:00:00 2001
From: Michael Buch <michaelbuch12 at gmail.com>
Date: Fri, 21 Mar 2025 11:16:29 +0000
Subject: [PATCH 1/2] [llvm][MetadataLoader] Make sure we correctly load
 DW_APPLE_ENUM_KIND from bitcode

This was pointed out in
https://github.com/llvm/llvm-project/pull/124752#issuecomment-2730052773

There was not test that roundtrips this attribute through LLVM bitcode, so this was never caught.
---
 llvm/lib/Bitcode/Reader/MetadataLoader.cpp           | 4 ++--
 llvm/test/DebugInfo/AArch64/DW_AT_APPLE_enum_kind.ll | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/llvm/lib/Bitcode/Reader/MetadataLoader.cpp b/llvm/lib/Bitcode/Reader/MetadataLoader.cpp
index 1baf0a9214e00..12794d3346e3f 100644
--- a/llvm/lib/Bitcode/Reader/MetadataLoader.cpp
+++ b/llvm/lib/Bitcode/Reader/MetadataLoader.cpp
@@ -1704,8 +1704,8 @@ Error MetadataLoader::MetadataLoaderImpl::parseOneMetadata(
       }
     }
 
-    if (Record.size() > 25 && Record[25] != dwarf::DW_APPLE_ENUM_KIND_invalid)
-      EnumKind = Record[25];
+    if (Record.size() > 24 && Record[24] != dwarf::DW_APPLE_ENUM_KIND_invalid)
+      EnumKind = Record[24];
 
     DICompositeType *CT = nullptr;
     if (Identifier)
diff --git a/llvm/test/DebugInfo/AArch64/DW_AT_APPLE_enum_kind.ll b/llvm/test/DebugInfo/AArch64/DW_AT_APPLE_enum_kind.ll
index 399d80c778072..4f219a7e7b12e 100644
--- a/llvm/test/DebugInfo/AArch64/DW_AT_APPLE_enum_kind.ll
+++ b/llvm/test/DebugInfo/AArch64/DW_AT_APPLE_enum_kind.ll
@@ -1,5 +1,6 @@
-; RUN: llc < %s -filetype=obj -o %t
-; RUN: llvm-dwarfdump -v %t | FileCheck %s
+; RUN: clang++ %s -c -g -emit-llvm -o %t.bc
+; RUN: llc %t.bc -filetype=obj -o %t.o
+; RUN: llvm-dwarfdump -v %t.o | FileCheck %s
 
 ; C++ source to regenerate:
 ; enum __attribute__((enum_extensibility(open))) OpenEnum {

>From 228d30a5909c6e59e8326d9864e99fbb5cae2287 Mon Sep 17 00:00:00 2001
From: Michael Buch <michaelbuch12 at gmail.com>
Date: Fri, 21 Mar 2025 15:40:20 +0000
Subject: [PATCH 2/2] fixup! remove clang dependency; roundtrip through
 llvm-dis/llvm-as instead

---
 llvm/test/DebugInfo/AArch64/DW_AT_APPLE_enum_kind.ll | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/llvm/test/DebugInfo/AArch64/DW_AT_APPLE_enum_kind.ll b/llvm/test/DebugInfo/AArch64/DW_AT_APPLE_enum_kind.ll
index 4f219a7e7b12e..750e7709a326c 100644
--- a/llvm/test/DebugInfo/AArch64/DW_AT_APPLE_enum_kind.ll
+++ b/llvm/test/DebugInfo/AArch64/DW_AT_APPLE_enum_kind.ll
@@ -1,6 +1,7 @@
-; RUN: clang++ %s -c -g -emit-llvm -o %t.bc
-; RUN: llc %t.bc -filetype=obj -o %t.o
-; RUN: llvm-dwarfdump -v %t.o | FileCheck %s
+; RUN: llc < %s -filetype=obj -o %t
+; RUN: llvm-dwarfdump -v %t | FileCheck %s
+;
+; RUN: llvm-as < %s | llvm-dis | llvm-as | llvm-dis | FileCheck %s --check-prefix=CHECK-METADATA
 
 ; C++ source to regenerate:
 ; enum __attribute__((enum_extensibility(open))) OpenEnum {
@@ -13,6 +14,8 @@
 ; 
 ; $ clang++ -O0 -g debug-info-enum-kind.cpp -c
 
+; CHECK-METADATA: enumKind: DW_APPLE_ENUM_KIND_Open
+; CHECK-METADATA: enumKind: DW_APPLE_ENUM_KIND_Closed
 
 ; CHECK: .debug_abbrev contents: