Skip to content

Conversation

dwblaikie
Copy link
Collaborator

@dwblaikie dwblaikie commented Sep 16, 2025

Applies the fix on top of the backport made in #156664

@dwblaikie dwblaikie closed this Sep 16, 2025
@dwblaikie dwblaikie reopened this Sep 16, 2025
@dwblaikie dwblaikie changed the base branch from main to release/21.x September 16, 2025 22:54
@dwblaikie dwblaikie marked this pull request as ready for review September 16, 2025 22:55
@llvmbot llvmbot added the clang Clang issues not falling into any other category label Sep 16, 2025
@llvmbot
Copy link
Member

llvmbot commented Sep 16, 2025

@llvm/pr-subscribers-clang

Author: David Blaikie (dwblaikie)

Changes

Applies the fix on top of the backport made in #156664


Full diff: https://github.com/llvm/llvm-project/pull/159209.diff

1 Files Affected:

  • (modified) clang/test/CodeGenCXX/debug-info-structured-binding.cpp (+1-1)
diff --git a/clang/test/CodeGenCXX/debug-info-structured-binding.cpp b/clang/test/CodeGenCXX/debug-info-structured-binding.cpp
index 4a4a4d8bdfaad..8032ce85c9e25 100644
--- a/clang/test/CodeGenCXX/debug-info-structured-binding.cpp
+++ b/clang/test/CodeGenCXX/debug-info-structured-binding.cpp
@@ -10,7 +10,7 @@
 // CHECK: getelementptr inbounds nuw %struct.A, ptr {{.*}}, i32 0, i32 1, !dbg ![[Y1_DEBUG_LOC:[0-9]+]]
 // CHECK: getelementptr inbounds nuw %struct.A, ptr {{.*}}, i32 0, i32 1, !dbg ![[Y2_DEBUG_LOC:[0-9]+]]
 // CHECK: load ptr, ptr %z2, {{.*}}!dbg ![[Z2_DEBUG_LOC:[0-9]+]]
-// CHECK: getelementptr inbounds [2 x i32], ptr {{.*}}, i64 0, i64 1, !dbg ![[A2_DEBUG_LOC:[0-9]+]]
+// CHECK: getelementptr inbounds [2 x i32], ptr {{.*}}, i{{64|32}} 0, i{{64|32}} 1, !dbg ![[A2_DEBUG_LOC:[0-9]+]]
 // CHECK: getelementptr inbounds nuw { i32, i32 }, ptr {{.*}}, i32 0, i32 1, !dbg ![[C2_DEBUG_LOC:[0-9]+]]
 // CHECK: extractelement <2 x i32> {{.*}}, i32 1, !dbg ![[V2_DEBUG_LOC:[0-9]+]]
 // CHECK: ![[VAR_0]] = !DILocalVariable(name: "a"

@nikic nikic added this to the LLVM 21.x Release milestone Sep 17, 2025
@github-project-automation github-project-automation bot moved this to Needs Triage in LLVM Release Status Sep 17, 2025
@dwblaikie dwblaikie requested a review from tru September 19, 2025 21:17
@tstellar tstellar moved this from Needs Triage to Needs Test Fix in LLVM Release Status Sep 23, 2025
@tstellar
Copy link
Collaborator

Are the test failures legitimate?

@dwblaikie
Copy link
Collaborator Author

dwblaikie commented Sep 23, 2025

Are the test failures legitimate?

sync and rerun seems to have cleared them up

Fix for the port of 665e875 to release/21.x in PR156664
@dyung dyung force-pushed the port_5b4819e_to_release branch from 31b750f to 4e9d1b6 Compare October 1, 2025 14:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
clang Clang issues not falling into any other category
Projects
Status: Needs Merge
Development

Successfully merging this pull request may close these issues.

4 participants