mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-22 06:44:35 +00:00
Auto merge of #86190 - asquared31415:extern-main-86110-fix, r=varkor
Fix ICE when `main` is declared in an `extern` block Changes in #84401 to implement `imported_main` changed how the crate entry point is found, and a declared `main` in an `extern` block was detected erroneously. This was causing the ICE described in #86110. This PR adds a check for this case and emits an error instead. Previously a `main` declaration in an `extern` block was not detected as an entry point at all, so emitting an error shouldn't break anything that worked previously. In 1.52.1 stable this is demonstrated, with a `` `main` function not found`` error. Fixes #86110
This commit is contained in:
commit
f8ac8fdacf
@ -1,3 +1,4 @@
|
||||
#[derive(Debug)]
|
||||
pub enum EntryPointType {
|
||||
None,
|
||||
MainNamed,
|
||||
|
@ -128,7 +128,7 @@ pub struct ResolverOutputs {
|
||||
pub main_def: Option<MainDefinition>,
|
||||
}
|
||||
|
||||
#[derive(Clone, Copy)]
|
||||
#[derive(Clone, Copy, Debug)]
|
||||
pub struct MainDefinition {
|
||||
pub res: Res<ast::NodeId>,
|
||||
pub is_import: bool,
|
||||
|
@ -2,7 +2,7 @@ use rustc_ast::entry::EntryPointType;
|
||||
use rustc_errors::struct_span_err;
|
||||
use rustc_hir::def_id::{DefId, CRATE_DEF_INDEX, LOCAL_CRATE};
|
||||
use rustc_hir::itemlikevisit::ItemLikeVisitor;
|
||||
use rustc_hir::{ForeignItem, HirId, ImplItem, Item, ItemKind, TraitItem, CRATE_HIR_ID};
|
||||
use rustc_hir::{ForeignItem, HirId, ImplItem, Item, ItemKind, Node, TraitItem, CRATE_HIR_ID};
|
||||
use rustc_middle::hir::map::Map;
|
||||
use rustc_middle::ty::query::Providers;
|
||||
use rustc_middle::ty::TyCtxt;
|
||||
@ -148,6 +148,20 @@ fn configure_main(tcx: TyCtxt<'_>, visitor: &EntryContext<'_, '_>) -> Option<(De
|
||||
} else if let Some((hir_id, _)) = visitor.attr_main_fn {
|
||||
Some((tcx.hir().local_def_id(hir_id).to_def_id(), EntryFnType::Main))
|
||||
} else if let Some(def_id) = tcx.main_def.and_then(|main_def| main_def.opt_fn_def_id()) {
|
||||
// non-local main imports are handled below
|
||||
if def_id.is_local() {
|
||||
let hir_id = tcx.hir().local_def_id_to_hir_id(def_id.expect_local());
|
||||
if matches!(tcx.hir().find(hir_id), Some(Node::ForeignItem(_))) {
|
||||
tcx.sess
|
||||
.struct_span_err(
|
||||
tcx.hir().span(hir_id),
|
||||
"the `main` function cannot be declared in an `extern` block",
|
||||
)
|
||||
.emit();
|
||||
return None;
|
||||
}
|
||||
}
|
||||
|
||||
if tcx.main_def.unwrap().is_import && !tcx.features().imported_main {
|
||||
let span = tcx.main_def.unwrap().span;
|
||||
feature_err(
|
||||
|
7
src/test/ui/extern/extern-main-issue-86110.rs
vendored
Normal file
7
src/test/ui/extern/extern-main-issue-86110.rs
vendored
Normal file
@ -0,0 +1,7 @@
|
||||
// missing and missing2 exist to make sure that the error only happens on a `main` declaration
|
||||
extern "C" {
|
||||
fn missing();
|
||||
fn main();
|
||||
//~^ the `main` function cannot be declared in an `extern` block
|
||||
fn missing2();
|
||||
}
|
8
src/test/ui/extern/extern-main-issue-86110.stderr
vendored
Normal file
8
src/test/ui/extern/extern-main-issue-86110.stderr
vendored
Normal file
@ -0,0 +1,8 @@
|
||||
error: the `main` function cannot be declared in an `extern` block
|
||||
--> $DIR/extern-main-issue-86110.rs:4:5
|
||||
|
|
||||
LL | fn main();
|
||||
| ^^^^^^^^^^
|
||||
|
||||
error: aborting due to previous error
|
||||
|
Loading…
Reference in New Issue
Block a user