Skip to content

Commit d30292c

Browse files
authored
Rollup merge of #71239 - JohnTitor:llvm-asm, r=Amanieu
Rename `asm` test directory in favor of `llvm_asm` r? @Amanieu
2 parents a12d42b + af442d9 commit d30292c

22 files changed

+19
-19
lines changed
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/test/ui/asm/asm-bad-clobber.stderr renamed to src/test/ui/llvm-asm/llvm-asm-bad-clobber.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0664]: clobber should not be surrounded by braces
2-
--> $DIR/asm-bad-clobber.rs:22:42
2+
--> $DIR/llvm-asm-bad-clobber.rs:22:42
33
|
44
LL | llvm_asm!("xor %eax, %eax" : : : "{eax}");
55
| ^^^^^^^

src/test/ui/asm/asm-in-bad-modifier.stderr renamed to src/test/ui/llvm-asm/llvm-asm-in-bad-modifier.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error[E0662]: input operand constraint contains '='
2-
--> $DIR/asm-in-bad-modifier.rs:23:44
2+
--> $DIR/llvm-asm-in-bad-modifier.rs:23:44
33
|
44
LL | llvm_asm!("mov $1, $0" : "=r"(x) : "=r"(5));
55
| ^^^^
66

77
error[E0663]: input operand constraint contains '+'
8-
--> $DIR/asm-in-bad-modifier.rs:24:44
8+
--> $DIR/llvm-asm-in-bad-modifier.rs:24:44
99
|
1010
LL | llvm_asm!("mov $1, $0" : "=r"(y) : "+r"(5));
1111
| ^^^^

src/test/ui/asm/asm-misplaced-option.stderr renamed to src/test/ui/llvm-asm/llvm-asm-misplaced-option.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
warning: unrecognized option
2-
--> $DIR/asm-misplaced-option.rs:24:69
2+
--> $DIR/llvm-asm-misplaced-option.rs:24:69
33
|
44
LL | llvm_asm!("mov $1, $0" : "=r"(x) : "r"(5_usize), "0"(x) : : "cc");
55
| ^^^^
66

77
warning: expected a clobber, found an option
8-
--> $DIR/asm-misplaced-option.rs:31:85
8+
--> $DIR/llvm-asm-misplaced-option.rs:31:85
99
|
1010
LL | llvm_asm!("add $2, $1; mov $1, $0" : "=r"(x) : "r"(x), "r"(8_usize) : "cc", "volatile");
1111
| ^^^^^^^^^^

src/test/ui/asm/asm-out-assign-imm.stderr renamed to src/test/ui/llvm-asm/llvm-asm-out-assign-imm.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0384]: cannot assign twice to immutable variable `x`
2-
--> $DIR/asm-out-assign-imm.rs:24:39
2+
--> $DIR/llvm-asm-out-assign-imm.rs:24:39
33
|
44
LL | let x: isize;
55
| - help: make this binding mutable: `mut x`

src/test/ui/asm/asm-out-no-modifier.stderr renamed to src/test/ui/llvm-asm/llvm-asm-out-no-modifier.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0661]: output operand constraint lacks '=' or '+'
2-
--> $DIR/asm-out-no-modifier.rs:22:34
2+
--> $DIR/llvm-asm-out-no-modifier.rs:22:34
33
|
44
LL | llvm_asm!("mov $1, $0" : "r"(x) : "r"(5));
55
| ^^^

src/test/ui/asm/asm-out-read-uninit.stderr renamed to src/test/ui/llvm-asm/llvm-asm-out-read-uninit.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0381]: use of possibly-uninitialized variable: `x`
2-
--> $DIR/asm-out-read-uninit.rs:22:48
2+
--> $DIR/llvm-asm-out-read-uninit.rs:22:48
33
|
44
LL | llvm_asm!("mov $1, $0" : "=r"(x) : "r"(x));
55
| ^ use of possibly-uninitialized `x`

src/test/ui/asm/asm-parse-errors.stderr renamed to src/test/ui/llvm-asm/llvm-asm-parse-errors.stderr

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,65 @@
11
error: macro requires a string literal as an argument
2-
--> $DIR/asm-parse-errors.rs:4:5
2+
--> $DIR/llvm-asm-parse-errors.rs:4:5
33
|
44
LL | llvm_asm!();
55
| ^^^^^^^^^^^^ string literal required
66

77
error: expected string literal
8-
--> $DIR/asm-parse-errors.rs:5:23
8+
--> $DIR/llvm-asm-parse-errors.rs:5:23
99
|
1010
LL | llvm_asm!("nop" : struct);
1111
| ^^^^^^ not a string literal
1212

1313
error: expected string literal
14-
--> $DIR/asm-parse-errors.rs:6:35
14+
--> $DIR/llvm-asm-parse-errors.rs:6:35
1515
|
1616
LL | llvm_asm!("mov %eax, $$0x2" : struct);
1717
| ^^^^^^ not a string literal
1818

1919
error: expected `(`, found keyword `struct`
20-
--> $DIR/asm-parse-errors.rs:7:44
20+
--> $DIR/llvm-asm-parse-errors.rs:7:44
2121
|
2222
LL | llvm_asm!("mov %eax, $$0x2" : "={eax}" struct);
2323
| ^^^^^^ expected `(`
2424

2525
error: expected expression, found keyword `struct`
26-
--> $DIR/asm-parse-errors.rs:8:44
26+
--> $DIR/llvm-asm-parse-errors.rs:8:44
2727
|
2828
LL | llvm_asm!("mov %eax, $$0x2" : "={eax}"(struct));
2929
| ^^^^^^ expected expression
3030

3131
error: expected string literal
32-
--> $DIR/asm-parse-errors.rs:9:49
32+
--> $DIR/llvm-asm-parse-errors.rs:9:49
3333
|
3434
LL | llvm_asm!("in %dx, %al" : "={al}"(result) : struct);
3535
| ^^^^^^ not a string literal
3636

3737
error: expected `(`, found keyword `struct`
38-
--> $DIR/asm-parse-errors.rs:10:56
38+
--> $DIR/llvm-asm-parse-errors.rs:10:56
3939
|
4040
LL | llvm_asm!("in %dx, %al" : "={al}"(result) : "{dx}" struct);
4141
| ^^^^^^ expected `(`
4242

4343
error: expected expression, found keyword `struct`
44-
--> $DIR/asm-parse-errors.rs:11:56
44+
--> $DIR/llvm-asm-parse-errors.rs:11:56
4545
|
4646
LL | llvm_asm!("in %dx, %al" : "={al}"(result) : "{dx}"(struct));
4747
| ^^^^^^ expected expression
4848

4949
error: expected string literal
50-
--> $DIR/asm-parse-errors.rs:12:41
50+
--> $DIR/llvm-asm-parse-errors.rs:12:41
5151
|
5252
LL | llvm_asm!("mov $$0x200, %eax" : : : struct);
5353
| ^^^^^^ not a string literal
5454

5555
error: expected string literal
56-
--> $DIR/asm-parse-errors.rs:13:50
56+
--> $DIR/llvm-asm-parse-errors.rs:13:50
5757
|
5858
LL | llvm_asm!("mov eax, 2" : "={eax}"(foo) : : : struct);
5959
| ^^^^^^ not a string literal
6060

6161
error: inline assembly must be a string literal
62-
--> $DIR/asm-parse-errors.rs:14:15
62+
--> $DIR/llvm-asm-parse-errors.rs:14:15
6363
|
6464
LL | llvm_asm!(123);
6565
| ^^^

0 commit comments

Comments
 (0)