Skip to content

Commit 7659abc

Browse files
committed
Auto merge of #115370 - matthiaskrgr:rollup-l0e1zuj, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #113565 (Make SIGSEGV handler emit nicer backtraces) - #114704 (parser: not insert dummy field in struct) - #115272 (miri/diagnostics: don't forget to print_backtrace when ICEing on unexpected errors) - #115313 (Make `get_return_block()` return `Some` only for HIR nodes in body) - #115347 (suggest removing `impl` in generic trait bound position) - #115355 (new solver: handle edge case of a recursion limit of 0) - #115363 (Don't suggest adding parentheses to call an inaccessible method.) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 82c2eb4 + ea23478 commit 7659abc

30 files changed

+498
-188
lines changed

compiler/rustc_const_eval/src/interpret/eval_context.rs

+22-1
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ use super::{
2525
Scalar, StackPopJump,
2626
};
2727
use crate::errors::{self, ErroneousConstUsed};
28-
use crate::fluent_generated as fluent;
2928
use crate::util;
29+
use crate::{fluent_generated as fluent, ReportErrorExt};
3030

3131
pub struct InterpCx<'mir, 'tcx, M: Machine<'mir, 'tcx>> {
3232
/// Stores the `Machine` instance.
@@ -432,6 +432,27 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
432432
.map_or(CRATE_HIR_ID, |def_id| self.tcx.hir().local_def_id_to_hir_id(def_id))
433433
}
434434

435+
/// Turn the given error into a human-readable string. Expects the string to be printed, so if
436+
/// `RUSTC_CTFE_BACKTRACE` is set this will show a backtrace of the rustc internals that
437+
/// triggered the error.
438+
///
439+
/// This is NOT the preferred way to render an error; use `report` from `const_eval` instead.
440+
/// However, this is useful when error messages appear in ICEs.
441+
pub fn format_error(&self, e: InterpErrorInfo<'tcx>) -> String {
442+
let (e, backtrace) = e.into_parts();
443+
backtrace.print_backtrace();
444+
// FIXME(fee1-dead), HACK: we want to use the error as title therefore we can just extract the
445+
// label and arguments from the InterpError.
446+
let handler = &self.tcx.sess.parse_sess.span_diagnostic;
447+
#[allow(rustc::untranslatable_diagnostic)]
448+
let mut diag = self.tcx.sess.struct_allow("");
449+
let msg = e.diagnostic_message();
450+
e.add_args(handler, &mut diag);
451+
let s = handler.eagerly_translate_to_string(msg, diag.args());
452+
diag.cancel();
453+
s
454+
}
455+
435456
#[inline(always)]
436457
pub(crate) fn stack(&self) -> &[Frame<'mir, 'tcx, M::Provenance, M::FrameExtra>] {
437458
M::stack(self)

compiler/rustc_const_eval/src/interpret/intern.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,8 @@ pub fn intern_const_alloc_recursive<
378378
ecx.tcx.sess.delay_span_bug(
379379
ecx.tcx.span,
380380
format!(
381-
"error during interning should later cause validation failure: {error:?}"
381+
"error during interning should later cause validation failure: {}",
382+
ecx.format_error(error),
382383
),
383384
);
384385
}

compiler/rustc_const_eval/src/interpret/validity.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -911,9 +911,10 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
911911
// Complain about any other kind of error -- those are bad because we'd like to
912912
// report them in a way that shows *where* in the value the issue lies.
913913
Err(err) => {
914-
let (err, backtrace) = err.into_parts();
915-
backtrace.print_backtrace();
916-
bug!("Unexpected Undefined Behavior error during validation: {err:?}");
914+
bug!(
915+
"Unexpected Undefined Behavior error during validation: {}",
916+
self.format_error(err)
917+
);
917918
}
918919
}
919920
}

compiler/rustc_driver_impl/src/lib.rs

+9-66
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,15 @@ pub mod pretty;
8585
#[macro_use]
8686
mod print;
8787
mod session_diagnostics;
88+
#[cfg(all(unix, any(target_env = "gnu", target_os = "macos")))]
89+
mod signal_handler;
90+
91+
#[cfg(not(all(unix, any(target_env = "gnu", target_os = "macos"))))]
92+
mod signal_handler {
93+
/// On platforms which don't support our signal handler's requirements,
94+
/// simply use the default signal handler provided by std.
95+
pub(super) fn install() {}
96+
}
8897

8998
use crate::session_diagnostics::{
9099
RLinkEmptyVersionNumber, RLinkEncodingVersionMismatch, RLinkRustcVersionMismatch,
@@ -1440,72 +1449,6 @@ pub fn init_env_logger(handler: &EarlyErrorHandler, env: &str) {
14401449
}
14411450
}
14421451

1443-
#[cfg(all(unix, any(target_env = "gnu", target_os = "macos")))]
1444-
mod signal_handler {
1445-
extern "C" {
1446-
fn backtrace_symbols_fd(
1447-
buffer: *const *mut libc::c_void,
1448-
size: libc::c_int,
1449-
fd: libc::c_int,
1450-
);
1451-
}
1452-
1453-
extern "C" fn print_stack_trace(_: libc::c_int) {
1454-
const MAX_FRAMES: usize = 256;
1455-
static mut STACK_TRACE: [*mut libc::c_void; MAX_FRAMES] =
1456-
[std::ptr::null_mut(); MAX_FRAMES];
1457-
unsafe {
1458-
let depth = libc::backtrace(STACK_TRACE.as_mut_ptr(), MAX_FRAMES as i32);
1459-
if depth == 0 {
1460-
return;
1461-
}
1462-
backtrace_symbols_fd(STACK_TRACE.as_ptr(), depth, 2);
1463-
}
1464-
}
1465-
1466-
/// When an error signal (such as SIGABRT or SIGSEGV) is delivered to the
1467-
/// process, print a stack trace and then exit.
1468-
pub(super) fn install() {
1469-
use std::alloc::{alloc, Layout};
1470-
1471-
unsafe {
1472-
let alt_stack_size: usize = min_sigstack_size() + 64 * 1024;
1473-
let mut alt_stack: libc::stack_t = std::mem::zeroed();
1474-
alt_stack.ss_sp = alloc(Layout::from_size_align(alt_stack_size, 1).unwrap()).cast();
1475-
alt_stack.ss_size = alt_stack_size;
1476-
libc::sigaltstack(&alt_stack, std::ptr::null_mut());
1477-
1478-
let mut sa: libc::sigaction = std::mem::zeroed();
1479-
sa.sa_sigaction = print_stack_trace as libc::sighandler_t;
1480-
sa.sa_flags = libc::SA_NODEFER | libc::SA_RESETHAND | libc::SA_ONSTACK;
1481-
libc::sigemptyset(&mut sa.sa_mask);
1482-
libc::sigaction(libc::SIGSEGV, &sa, std::ptr::null_mut());
1483-
}
1484-
}
1485-
1486-
/// Modern kernels on modern hardware can have dynamic signal stack sizes.
1487-
#[cfg(any(target_os = "linux", target_os = "android"))]
1488-
fn min_sigstack_size() -> usize {
1489-
const AT_MINSIGSTKSZ: core::ffi::c_ulong = 51;
1490-
let dynamic_sigstksz = unsafe { libc::getauxval(AT_MINSIGSTKSZ) };
1491-
// If getauxval couldn't find the entry, it returns 0,
1492-
// so take the higher of the "constant" and auxval.
1493-
// This transparently supports older kernels which don't provide AT_MINSIGSTKSZ
1494-
libc::MINSIGSTKSZ.max(dynamic_sigstksz as _)
1495-
}
1496-
1497-
/// Not all OS support hardware where this is needed.
1498-
#[cfg(not(any(target_os = "linux", target_os = "android")))]
1499-
fn min_sigstack_size() -> usize {
1500-
libc::MINSIGSTKSZ
1501-
}
1502-
}
1503-
1504-
#[cfg(not(all(unix, any(target_env = "gnu", target_os = "macos"))))]
1505-
mod signal_handler {
1506-
pub(super) fn install() {}
1507-
}
1508-
15091452
pub fn main() -> ! {
15101453
let start_time = Instant::now();
15111454
let start_rss = get_resident_set_size();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,142 @@
1+
//! Signal handler for rustc
2+
//! Primarily used to extract a backtrace from stack overflow
3+
4+
use std::alloc::{alloc, Layout};
5+
use std::{fmt, mem, ptr};
6+
7+
extern "C" {
8+
fn backtrace_symbols_fd(buffer: *const *mut libc::c_void, size: libc::c_int, fd: libc::c_int);
9+
}
10+
11+
fn backtrace_stderr(buffer: &[*mut libc::c_void]) {
12+
let size = buffer.len().try_into().unwrap_or_default();
13+
unsafe { backtrace_symbols_fd(buffer.as_ptr(), size, libc::STDERR_FILENO) };
14+
}
15+
16+
/// Unbuffered, unsynchronized writer to stderr.
17+
///
18+
/// Only acceptable because everything will end soon anyways.
19+
struct RawStderr(());
20+
21+
impl fmt::Write for RawStderr {
22+
fn write_str(&mut self, s: &str) -> Result<(), fmt::Error> {
23+
let ret = unsafe { libc::write(libc::STDERR_FILENO, s.as_ptr().cast(), s.len()) };
24+
if ret == -1 { Err(fmt::Error) } else { Ok(()) }
25+
}
26+
}
27+
28+
/// We don't really care how many bytes we actually get out. SIGSEGV comes for our head.
29+
/// Splash stderr with letters of our own blood to warn our friends about the monster.
30+
macro raw_errln($tokens:tt) {
31+
let _ = ::core::fmt::Write::write_fmt(&mut RawStderr(()), format_args!($tokens));
32+
let _ = ::core::fmt::Write::write_char(&mut RawStderr(()), '\n');
33+
}
34+
35+
/// Signal handler installed for SIGSEGV
36+
extern "C" fn print_stack_trace(_: libc::c_int) {
37+
const MAX_FRAMES: usize = 256;
38+
// Reserve data segment so we don't have to malloc in a signal handler, which might fail
39+
// in incredibly undesirable and unexpected ways due to e.g. the allocator deadlocking
40+
static mut STACK_TRACE: [*mut libc::c_void; MAX_FRAMES] = [ptr::null_mut(); MAX_FRAMES];
41+
let stack = unsafe {
42+
// Collect return addresses
43+
let depth = libc::backtrace(STACK_TRACE.as_mut_ptr(), MAX_FRAMES as i32);
44+
if depth == 0 {
45+
return;
46+
}
47+
&STACK_TRACE.as_slice()[0..(depth as _)]
48+
};
49+
50+
// Just a stack trace is cryptic. Explain what we're doing.
51+
raw_errln!("error: rustc interrupted by SIGSEGV, printing backtrace\n");
52+
let mut written = 1;
53+
let mut consumed = 0;
54+
// Begin elaborating return addrs into symbols and writing them directly to stderr
55+
// Most backtraces are stack overflow, most stack overflows are from recursion
56+
// Check for cycles before writing 250 lines of the same ~5 symbols
57+
let cycled = |(runner, walker)| runner == walker;
58+
let mut cyclic = false;
59+
if let Some(period) = stack.iter().skip(1).step_by(2).zip(stack).position(cycled) {
60+
let period = period.saturating_add(1); // avoid "what if wrapped?" branches
61+
let Some(offset) = stack.iter().skip(period).zip(stack).position(cycled) else {
62+
// impossible.
63+
return;
64+
};
65+
66+
// Count matching trace slices, else we could miscount "biphasic cycles"
67+
// with the same period + loop entry but a different inner loop
68+
let next_cycle = stack[offset..].chunks_exact(period).skip(1);
69+
let cycles = 1 + next_cycle
70+
.zip(stack[offset..].chunks_exact(period))
71+
.filter(|(next, prev)| next == prev)
72+
.count();
73+
backtrace_stderr(&stack[..offset]);
74+
written += offset;
75+
consumed += offset;
76+
if cycles > 1 {
77+
raw_errln!("\n### cycle encountered after {offset} frames with period {period}");
78+
backtrace_stderr(&stack[consumed..consumed + period]);
79+
raw_errln!("### recursed {cycles} times\n");
80+
written += period + 4;
81+
consumed += period * cycles;
82+
cyclic = true;
83+
};
84+
}
85+
let rem = &stack[consumed..];
86+
backtrace_stderr(rem);
87+
raw_errln!("");
88+
written += rem.len() + 1;
89+
90+
let random_depth = || 8 * 16; // chosen by random diceroll (2d20)
91+
if cyclic || stack.len() > random_depth() {
92+
// technically speculation, but assert it with confidence anyway.
93+
// rustc only arrived in this signal handler because bad things happened
94+
// and this message is for explaining it's not the programmer's fault
95+
raw_errln!("note: rustc unexpectedly overflowed its stack! this is a bug");
96+
written += 1;
97+
}
98+
if stack.len() == MAX_FRAMES {
99+
raw_errln!("note: maximum backtrace depth reached, frames may have been lost");
100+
written += 1;
101+
}
102+
raw_errln!("note: we would appreciate a report at https://github.com/rust-lang/rust");
103+
written += 1;
104+
if written > 24 {
105+
// We probably just scrolled the earlier "we got SIGSEGV" message off the terminal
106+
raw_errln!("note: backtrace dumped due to SIGSEGV! resuming signal");
107+
};
108+
}
109+
110+
/// When SIGSEGV is delivered to the process, print a stack trace and then exit.
111+
pub(super) fn install() {
112+
unsafe {
113+
let alt_stack_size: usize = min_sigstack_size() + 64 * 1024;
114+
let mut alt_stack: libc::stack_t = mem::zeroed();
115+
alt_stack.ss_sp = alloc(Layout::from_size_align(alt_stack_size, 1).unwrap()).cast();
116+
alt_stack.ss_size = alt_stack_size;
117+
libc::sigaltstack(&alt_stack, ptr::null_mut());
118+
119+
let mut sa: libc::sigaction = mem::zeroed();
120+
sa.sa_sigaction = print_stack_trace as libc::sighandler_t;
121+
sa.sa_flags = libc::SA_NODEFER | libc::SA_RESETHAND | libc::SA_ONSTACK;
122+
libc::sigemptyset(&mut sa.sa_mask);
123+
libc::sigaction(libc::SIGSEGV, &sa, ptr::null_mut());
124+
}
125+
}
126+
127+
/// Modern kernels on modern hardware can have dynamic signal stack sizes.
128+
#[cfg(any(target_os = "linux", target_os = "android"))]
129+
fn min_sigstack_size() -> usize {
130+
const AT_MINSIGSTKSZ: core::ffi::c_ulong = 51;
131+
let dynamic_sigstksz = unsafe { libc::getauxval(AT_MINSIGSTKSZ) };
132+
// If getauxval couldn't find the entry, it returns 0,
133+
// so take the higher of the "constant" and auxval.
134+
// This transparently supports older kernels which don't provide AT_MINSIGSTKSZ
135+
libc::MINSIGSTKSZ.max(dynamic_sigstksz as _)
136+
}
137+
138+
/// Not all OS support hardware where this is needed.
139+
#[cfg(not(any(target_os = "linux", target_os = "android")))]
140+
fn min_sigstack_size() -> usize {
141+
libc::MINSIGSTKSZ
142+
}

compiler/rustc_hir_typeck/src/expr.rs

+2-8
Original file line numberDiff line numberDiff line change
@@ -2310,13 +2310,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
23102310

23112311
let guar = if field.name == kw::Empty {
23122312
self.tcx.sess.delay_span_bug(field.span, "field name with no name")
2313-
} else if self.method_exists(
2314-
field,
2315-
base_ty,
2316-
expr.hir_id,
2317-
true,
2318-
expected.only_has_type(self),
2319-
) {
2313+
} else if self.method_exists(field, base_ty, expr.hir_id, expected.only_has_type(self)) {
23202314
self.ban_take_value_of_method(expr, base_ty, field)
23212315
} else if !base_ty.is_primitive_ty() {
23222316
self.ban_nonexisting_field(field, base, expr, base_ty)
@@ -2501,7 +2495,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
25012495
let mut err = self.private_field_err(field, base_did);
25022496

25032497
// Also check if an accessible method exists, which is often what is meant.
2504-
if self.method_exists(field, expr_t, expr.hir_id, false, return_ty)
2498+
if self.method_exists(field, expr_t, expr.hir_id, return_ty)
25052499
&& !self.expr_in_place(expr.hir_id)
25062500
{
25072501
self.suggest_method_call(

compiler/rustc_hir_typeck/src/method/mod.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,13 @@ pub enum CandidateSource {
8989
}
9090

9191
impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
92-
/// Determines whether the type `self_ty` supports a method name `method_name` or not.
92+
/// Determines whether the type `self_ty` supports a visible method named `method_name` or not.
9393
#[instrument(level = "debug", skip(self))]
9494
pub fn method_exists(
9595
&self,
9696
method_name: Ident,
9797
self_ty: Ty<'tcx>,
9898
call_expr_id: hir::HirId,
99-
allow_private: bool,
10099
return_type: Option<Ty<'tcx>>,
101100
) -> bool {
102101
match self.probe_for_name(
@@ -118,7 +117,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
118117
}
119118
Err(NoMatch(..)) => false,
120119
Err(Ambiguity(..)) => true,
121-
Err(PrivateMatch(..)) => allow_private,
120+
Err(PrivateMatch(..)) => false,
122121
Err(IllegalSizedBound { .. }) => true,
123122
Err(BadReturnType) => false,
124123
}

compiler/rustc_hir_typeck/src/method/suggest.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -2361,8 +2361,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
23612361
Some(output_ty) => self.resolve_vars_if_possible(output_ty),
23622362
_ => return,
23632363
};
2364-
let method_exists =
2365-
self.method_exists(item_name, output_ty, call.hir_id, true, return_type);
2364+
let method_exists = self.method_exists(item_name, output_ty, call.hir_id, return_type);
23662365
debug!("suggest_await_before_method: is_method_exist={}", method_exists);
23672366
if method_exists {
23682367
err.span_suggestion_verbose(

compiler/rustc_middle/src/hir/map/mod.rs

+12-1
Original file line numberDiff line numberDiff line change
@@ -701,6 +701,8 @@ impl<'hir> Map<'hir> {
701701
// expressions.
702702
ignore_tail = true;
703703
}
704+
705+
let mut prev_hir_id = None;
704706
while let Some((hir_id, node)) = iter.next() {
705707
if let (Some((_, next_node)), false) = (iter.peek(), ignore_tail) {
706708
match next_node {
@@ -715,14 +717,23 @@ impl<'hir> Map<'hir> {
715717
| Node::ForeignItem(_)
716718
| Node::TraitItem(_)
717719
| Node::Expr(Expr { kind: ExprKind::Closure { .. }, .. })
718-
| Node::ImplItem(_) => return Some(hir_id),
720+
| Node::ImplItem(_)
721+
// The input node `id` must be enclosed in the method's body as opposed
722+
// to some other place such as its return type (fixes #114918).
723+
// We verify that indirectly by checking that the previous node is the
724+
// current node's body
725+
if node.body_id().map(|b| b.hir_id) == prev_hir_id => {
726+
return Some(hir_id)
727+
}
719728
// Ignore `return`s on the first iteration
720729
Node::Expr(Expr { kind: ExprKind::Loop(..) | ExprKind::Ret(..), .. })
721730
| Node::Local(_) => {
722731
return None;
723732
}
724733
_ => {}
725734
}
735+
736+
prev_hir_id = Some(hir_id);
726737
}
727738
None
728739
}

compiler/rustc_mir_transform/src/const_prop_lint.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,8 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> {
273273
// dedicated error variants should be introduced instead.
274274
assert!(
275275
!error.kind().formatted_string(),
276-
"const-prop encountered formatting error: {error:?}",
276+
"const-prop encountered formatting error: {}",
277+
self.ecx.format_error(error),
277278
);
278279
None
279280
}

0 commit comments

Comments
 (0)