Skip to content

Commit

Permalink
Rollup merge of #97920 - bjorn3:test_annotation_fixes, r=Dylan-DPC
Browse files Browse the repository at this point in the history
Fix some test annotations

These are necessary for running the rustc test suite with cg_clif.
  • Loading branch information
compiler-errors authored Jun 13, 2022
2 parents 546c826 + 2f47edb commit 6efaaed
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
1 change: 1 addition & 0 deletions src/test/ui/asm/x86_64/issue-82869.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// needs-asm-support
// only-x86_64
// Make sure rustc doesn't ICE on asm! for a foreign architecture.

Expand Down
6 changes: 3 additions & 3 deletions src/test/ui/asm/x86_64/issue-82869.stderr
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
error: invalid register class `vreg`: unknown register class
--> $DIR/issue-82869.rs:10:32
--> $DIR/issue-82869.rs:11:32
|
LL | asm!("add {:d}, {:d}, d0", out(vreg) c, in(vreg) a, in("d0") {
| ^^^^^^^^^^^

error: invalid register class `vreg`: unknown register class
--> $DIR/issue-82869.rs:10:45
--> $DIR/issue-82869.rs:11:45
|
LL | asm!("add {:d}, {:d}, d0", out(vreg) c, in(vreg) a, in("d0") {
| ^^^^^^^^^^

error: invalid register `d0`: unknown register
--> $DIR/issue-82869.rs:10:57
--> $DIR/issue-82869.rs:11:57
|
LL | asm!("add {:d}, {:d}, d0", out(vreg) c, in(vreg) a, in("d0") {
| _________________________________________________________^
Expand Down
1 change: 1 addition & 0 deletions src/test/ui/drop/repeat-drop.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// run-pass
// needs-unwind
// ignore-wasm32-bare no unwinding panic
// ignore-avr no unwinding panic
// ignore-nvptx64 no unwinding panic
Expand Down

0 comments on commit 6efaaed

Please sign in to comment.