Skip to content
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

Rollup of 5 pull requests #128785

Closed
wants to merge 13 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

dheaton-arm and others added 13 commits July 30, 2024 10:12
Added run-make tests to verify that, between a Rust-C FFI boundary in both directions,
any MTE tags included in a pointer are preserved for the following pointer types, as
well as any information stored using TBI:
- int
- float
- string
- function

Verified

This commit was signed with the committer’s verified signature.
marcoieni Marco Ieni

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Add tests to ensure MTE tags are preserved across FFI boundaries

Added run-make tests to verify that, between a Rust-C FFI boundary in both directions, any MTE tags included in a pointer are preserved for the following pointer types, as well as any information stored using TBI:
- int
- float
- string
- function

try-job: aarch64-gnu
…jieyouxu

Migrate `min-global-align` and `no-alloc-shim` `run-make` tests to rmake

Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).

Please try:

try-job: aarch64-apple
try-job: test-various
try-job: armhf-gnu
try-job: x86_64-gnu-llvm-17
…-m, r=jieyouxu

migrate `thumb-none-cortex-m` to rmake

tracking issue: rust-lang#121876

I'll leave some comments/questions inline

r? ``@jieyouxu``

try-job: armhf-gnu
try-job: dist-various-1
try-job: test-various
…r=jieyouxu

Migrate `staticlib-dylib-linkage` `run-make` test to rmake

Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).

I'm quite sure this has the same issue as the one brought up in [this discussion](rust-lang#128407 (comment)), so I elected to keep the ignore MSVC.

try-job: aarch64-apple
try-job: x86_64-gnu-llvm-17
try-job: armhf-gnu
@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) rollup A PR which is a rollup labels Aug 7, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Aug 7, 2024

📌 Commit acef3a1 has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 7, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 7, 2024
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#128384 (Add tests to ensure MTE tags are preserved across FFI boundaries)
 - rust-lang#128407 (Migrate `min-global-align` and `no-alloc-shim` `run-make` tests to rmake)
 - rust-lang#128584 (Add a set of tests for LLVM 19)
 - rust-lang#128636 (migrate `thumb-none-cortex-m` to rmake)
 - rust-lang#128696 (Migrate `staticlib-dylib-linkage` `run-make` test to rmake)

Failed merges:

 - rust-lang#128639 (migrate `thumb-none-qemu` to rmake)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Collaborator

bors commented Aug 7, 2024

⌛ Testing commit acef3a1 with merge d6092d0...

@rust-log-analyzer
Copy link
Collaborator

The job i686-gnu failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
failures:

---- [codegen] tests/codegen/issues/issue-126585.rs stdout ----

error: verification with 'FileCheck' failed
status: exit status: 1
command: "/checkout/obj/build/i686-unknown-linux-gnu/llvm/build/bin/FileCheck" "--input-file" "/checkout/obj/build/i686-unknown-linux-gnu/test/codegen/issues/issue-126585/issue-126585.ll" "/checkout/tests/codegen/issues/issue-126585.rs" "--check-prefix=CHECK" "--check-prefix" "NONMSVC" "--allow-unused-prefixes" "--dump-input-context" "100"
--- stderr -------------------------------
/checkout/tests/codegen/issues/issue-126585.rs:14:16: error: CHECK-NOT: excluded string found in input
/checkout/tests/codegen/issues/issue-126585.rs:14:16: error: CHECK-NOT: excluded string found in input
 // CHECK-NOT: undef
               ^
/checkout/obj/build/i686-unknown-linux-gnu/test/codegen/issues/issue-126585/issue-126585.ll:18:56: note: found here
 %_0.sroa.4.0 = phi i64 [ %_3, %bb4 ], [ %a, %bb2 ], [ undef, %start ]

Input file: /checkout/obj/build/i686-unknown-linux-gnu/test/codegen/issues/issue-126585/issue-126585.ll
Check file: /checkout/tests/codegen/issues/issue-126585.rs


-dump-input=help explains the following input dump.
Input was:
<<<<<<
<<<<<<
        1: ; ModuleID = 'issue_126585.e42e205c2c8edf18-cgu.0' 
        2: source_filename = "issue_126585.e42e205c2c8edf18-cgu.0" 
        3: target datalayout = "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-i128:128-f64:32:64-f80:32-n8:16:32-S128" 
        4: target triple = "i686-unknown-linux-gnu" 
        5:  
        6: ; Function Attrs: mustprogress nofree norecurse nosync nounwind optsize willreturn memory(none) uwtable 
        7: define { i32, i64 } @checked_div_round(i64 noundef %a, i64 noundef %b) unnamed_addr #0 { 
        8: start: 
        9:  switch i64 %b, label %bb4 [ 
       10:  i64 0, label %bb9 
       11:  i64 1, label %bb2 
       12:  ] 
       13:  
       14: bb2: ; preds = %start 
       15:  br label %bb9 
       16:  
       17: bb9: ; preds = %start, %bb4, %bb2 
       18:  %_0.sroa.4.0 = phi i64 [ %_3, %bb4 ], [ %a, %bb2 ], [ undef, %start ] 
not:14                                                            !~~~~            error: no match expected
       19:  %_0.sroa.0.0 = phi i32 [ 1, %bb4 ], [ 1, %bb2 ], [ 0, %start ] 
       20:  %0 = insertvalue { i32, i64 } poison, i32 %_0.sroa.0.0, 0 
       21:  %1 = insertvalue { i32, i64 } %0, i64 %_0.sroa.4.0, 1 
       22:  ret { i32, i64 } %1 
       23:  
       24: bb4: ; preds = %start 
       25:  %_4 = udiv i64 %a, %b 
       26:  %2 = mul i64 %_4, %b 
       27:  %_9.decomposed = sub i64 %a, %2 
       28:  %_8 = shl i64 %_9.decomposed, 1 
       29:  %_7.not = icmp uge i64 %_8, %b 
       30:  %. = zext i1 %_7.not to i64 
       31:  %_3 = add nuw i64 %_4, %. 
       32:  br label %bb9 
       33: } 
       34:  
       35: attributes #0 = { mustprogress nofree norecurse nosync nounwind optsize willreturn memory(none) uwtable "probe-stack"="inline-asm" "target-cpu"="pentium4" } 
       36:  
       37: !llvm.module.flags = !{!0} 
       38: !llvm.ident = !{!1} 
       39:  
       40: !0 = !{i32 8, !"PIC Level", i32 2} 
       41: !1 = !{!"rustc version 1.82.0-nightly (d6092d0cb 2024-08-07)"} 
------------------------------------------



@bors
Copy link
Collaborator

bors commented Aug 7, 2024

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 7, 2024
@matthiaskrgr matthiaskrgr deleted the rollup-13chr4m branch September 1, 2024 17:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants