Skip to content

Fix for merging PR #89456 into llvm 18.X #90118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Conversation

bwendling
Copy link
Collaborator

Fix #89126 for the 18.X branch.

@bwendling bwendling added this to the LLVM 18.X Release milestone Apr 25, 2024
@llvmbot llvmbot added the clang Clang issues not falling into any other category label Apr 25, 2024
@llvmbot
Copy link
Member

llvmbot commented Apr 25, 2024

@llvm/pr-subscribers-clang

Author: Bill Wendling (bwendling)

Changes

Fix #89126 for the 18.X branch.


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

1 Files Affected:

  • (modified) clang/test/CodeGen/attr-counted-by-pr88931.c (+1-1)
diff --git a/clang/test/CodeGen/attr-counted-by-pr88931.c b/clang/test/CodeGen/attr-counted-by-pr88931.c
index cc3d751c7c6d83..520ebd09973284 100644
--- a/clang/test/CodeGen/attr-counted-by-pr88931.c
+++ b/clang/test/CodeGen/attr-counted-by-pr88931.c
@@ -14,7 +14,7 @@ void init(void * __attribute__((pass_dynamic_object_size(0))));
 // CHECK-LABEL: define dso_local void @test1(
 // CHECK-SAME: ptr noundef [[P:%.*]]) local_unnamed_addr #[[ATTR0:[0-9]+]] {
 // CHECK-NEXT:  entry:
-// CHECK-NEXT:    [[ARRAY:%.*]] = getelementptr inbounds i8, ptr [[P]], i64 4
+// CHECK-NEXT:    [[ARRAY:%.*]] = getelementptr inbounds [[STRUCT_BAR:%.*]], ptr [[P]], i64 0, i32 1
 // CHECK-NEXT:    tail call void @init(ptr noundef nonnull [[ARRAY]], i64 noundef -1) #[[ATTR2:[0-9]+]]
 // CHECK-NEXT:    ret void
 //

@efriedma-quic
Copy link
Collaborator

The pull request needs to be against llvm:release/18.x, not llvm:main.

@bwendling
Copy link
Collaborator Author

Does it matter if it's just a cherry-pick?

@efriedma-quic
Copy link
Collaborator

We don't merge anything against the release branch until the buildbots pass. For the buildbots to run, someone needs to manually create a pull request against 18.x branch containing both the original patch and whatever changes are necessary to make the buildbots pass.

@bwendling bwendling closed this May 14, 2024
@bwendling bwendling deleted the fix branch May 14, 2024 23:01
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
Development

Successfully merging this pull request may close these issues.

3 participants