Rollup merge of #75350 - estebank:foreign-fn-with-body-ice, r=davidtwco

Do not ICE when lowering invalid extern fn with bodies

Fix #75283.
This commit is contained in:
Yuki Okushi 2020-08-10 09:08:03 +09:00 committed by GitHub
commit 5369619693
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 1 deletions

View File

@ -573,7 +573,9 @@ fn visit_ty(&mut self, t: &'tcx Ty) {
.resolver
.trait_map()
.iter()
.map(|(&k, v)| (self.node_id_to_hir_id[k].unwrap(), v.clone()))
.filter_map(|(&k, v)| {
self.node_id_to_hir_id.get(k).and_then(|id| id.as_ref()).map(|id| (*id, v.clone()))
})
.collect();
let mut def_id_to_hir_id = IndexVec::default();

View File

@ -0,0 +1,6 @@
extern "C" {
fn lol() { //~ ERROR incorrect function inside `extern` block
println!("");
}
}
fn main() {}

View File

@ -0,0 +1,18 @@
error: incorrect function inside `extern` block
--> $DIR/issue-75283.rs:2:8
|
LL | extern "C" {
| ---------- `extern` blocks define existing foreign functions and functions inside of them cannot have a body
LL | fn lol() {
| ________^^^___-
| | |
| | cannot have a body
LL | | println!("");
LL | | }
| |_____- help: remove the invalid body: `;`
|
= help: you might have meant to write a function accessible through FFI, which can be done by writing `extern fn` outside of the `extern` block
= note: for more information, visit https://doc.rust-lang.org/std/keyword.extern.html
error: aborting due to previous error