Rollup merge of #50752 - GuillaumeGomez:more-error-code-in-libsyntax-ext, r=frewsxcv

Add missing error codes in libsyntax-ext asm
This commit is contained in:
kennytm 2018-05-16 23:22:57 +08:00
commit 39129a5492
No known key found for this signature in database
GPG Key ID: FEF6C8051D0E013C
8 changed files with 146 additions and 3 deletions

View File

@ -179,9 +179,11 @@ pub fn expand_asm<'cx>(cx: &'cx mut ExtCtxt,
let (constraint, _str_style) = panictry!(p.parse_str());
if constraint.as_str().starts_with("=") {
cx.span_err(p.prev_span, "input operand constraint contains '='");
span_err_if_not_stage0!(cx, p.prev_span, E0662,
"input operand constraint contains '='");
} else if constraint.as_str().starts_with("+") {
cx.span_err(p.prev_span, "input operand constraint contains '+'");
span_err_if_not_stage0!(cx, p.prev_span, E0663,
"input operand constraint contains '+'");
}
panictry!(p.expect(&token::OpenDelim(token::Paren)));
@ -203,7 +205,8 @@ pub fn expand_asm<'cx>(cx: &'cx mut ExtCtxt,
if OPTIONS.iter().any(|&opt| s == opt) {
cx.span_warn(p.prev_span, "expected a clobber, found an option");
} else if s.as_str().starts_with("{") || s.as_str().ends_with("}") {
cx.span_err(p.prev_span, "clobber should not be surrounded by braces");
span_err_if_not_stage0!(cx, p.prev_span, E0664,
"clobber should not be surrounded by braces");
}
clobs.push(s);

View File

@ -38,6 +38,58 @@ let a;
asm!("nop" : "r"(a));
```
Considering that this would be a long explanation, we instead recommend you to
take a look at the unstable book:
https://doc.rust-lang.org/unstable-book/language-features/asm.html
"##,
E0662: r##"
An invalid input operand constraint was passed to the `asm` macro (third line).
Erroneous code example:
```compile_fail,E0662
asm!("xor %eax, %eax"
:
: "=test"("a")
);
```
Considering that this would be a long explanation, we instead recommend you to
take a look at the unstable book:
https://doc.rust-lang.org/unstable-book/language-features/asm.html
"##,
E0663: r##"
An invalid input operand constraint was passed to the `asm` macro (third line).
Erroneous code example:
```compile_fail,E0663
asm!("xor %eax, %eax"
:
: "+test"("a")
);
```
Considering that this would be a long explanation, we instead recommend you to
take a look at the unstable book:
https://doc.rust-lang.org/unstable-book/language-features/asm.html
"##,
E0664: r##"
A clobber was surrounded by braces in the `asm` macro.
Erroneous code example:
```compile_fail,E0663
asm!("mov $$0x200, %eax"
:
:
: "{eax}"
);
```
Considering that this would be a long explanation, we instead recommend you to
take a look at the unstable book:
https://doc.rust-lang.org/unstable-book/language-features/asm.html

20
src/test/ui/E0662.rs Normal file
View File

@ -0,0 +1,20 @@
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// ignore-stage1
#![feature(asm)]
fn main() {
asm!("xor %eax, %eax"
:
: "=test"("a") //~ ERROR E0662
);
}

9
src/test/ui/E0662.stderr Normal file
View File

@ -0,0 +1,9 @@
error[E0662]: input operand constraint contains '='
--> $DIR/E0662.rs:18:12
|
LL | : "=test"("a") //~ ERROR E0662
| ^^^^^^^
error: aborting due to previous error
For more information about this error, try `rustc --explain E0662`.

20
src/test/ui/E0663.rs Normal file
View File

@ -0,0 +1,20 @@
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// ignore-stage1
#![feature(asm)]
fn main() {
asm!("xor %eax, %eax"
:
: "+test"("a") //~ ERROR E0663
);
}

9
src/test/ui/E0663.stderr Normal file
View File

@ -0,0 +1,9 @@
error[E0663]: input operand constraint contains '+'
--> $DIR/E0663.rs:18:12
|
LL | : "+test"("a") //~ ERROR E0663
| ^^^^^^^
error: aborting due to previous error
For more information about this error, try `rustc --explain E0663`.

21
src/test/ui/E0664.rs Normal file
View File

@ -0,0 +1,21 @@
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// ignore-stage1
#![feature(asm)]
fn main() {
asm!("mov $$0x200, %eax"
:
:
: "{eax}" //~ ERROR E0664
);
}

9
src/test/ui/E0664.stderr Normal file
View File

@ -0,0 +1,9 @@
error[E0664]: clobber should not be surrounded by braces
--> $DIR/E0664.rs:19:12
|
LL | : "{eax}" //~ ERROR E0664
| ^^^^^^^
error: aborting due to previous error
For more information about this error, try `rustc --explain E0664`.