Skip to content

Fix an ICE parsing a malformed literal in concat_bytes!. #105039

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

Merged
merged 1 commit into from
Nov 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion compiler/rustc_builtin_macros/src/concat_bytes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ use rustc_ast as ast;
use rustc_ast::{ptr::P, tokenstream::TokenStream};
use rustc_errors::Applicability;
use rustc_expand::base::{self, DummyResult};
use rustc_session::errors::report_lit_error;
use rustc_span::Span;

/// Emits errors for literal expressions that are invalid inside and outside of an array.
Expand Down Expand Up @@ -68,7 +69,10 @@ fn invalid_type_err(
Ok(ast::LitKind::Int(_, _)) => {
cx.span_err(span, "numeric literal is not a `u8`");
}
_ => unreachable!(),
Ok(ast::LitKind::ByteStr(_) | ast::LitKind::Byte(_)) => unreachable!(),
Err(err) => {
report_lit_error(&cx.sess.parse_sess, err, token_lit, span);
}
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#![feature(concat_bytes)]

fn main() {
concat_bytes!(7Y);
//~^ ERROR invalid suffix `Y` for number literal
concat_bytes!(888888888888888888888888888888888888888);
//~^ ERROR integer literal is too large
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
error: invalid suffix `Y` for number literal
--> $DIR/issue-104769-concat_bytes-invalid-literal.rs:4:19
|
LL | concat_bytes!(7Y);
| ^^ invalid suffix `Y`
|
= help: the suffix must be one of the numeric types (`u32`, `isize`, `f32`, etc.)

error: integer literal is too large
--> $DIR/issue-104769-concat_bytes-invalid-literal.rs:6:19
|
LL | concat_bytes!(888888888888888888888888888888888888888);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

error: aborting due to 2 previous errors