Skip to content

Commit

Permalink
Auto merge of rust-lang#133179 - GuillaumeGomez:rollup-ro5rtts, r=Gui…
Browse files Browse the repository at this point in the history
…llaumeGomez

Rollup of 5 pull requests

Successful merges:

 - rust-lang#133156 (typo in config.example.toml)
 - rust-lang#133157 (stability: remove skip_stability_check_due_to_privacy)
 - rust-lang#133163 (remove pointless cold_path impl in interpreter)
 - rust-lang#133169 (Update autolabels for T-compiler and T-bootstrap)
 - rust-lang#133171 (Add the missing quotation mark in comment)

r? `@ghost`
`@rustbot` modify labels: rollup
  • Loading branch information
bors committed Nov 18, 2024
2 parents c602e9a + 62d0235 commit 03ee484
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 45 deletions.
1 change: 1 addition & 0 deletions compiler/rustc_codegen_cranelift/src/intrinsics/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1264,6 +1264,7 @@ fn codegen_regular_intrinsic_call<'tcx>(

sym::cold_path => {
// This is a no-op. The intrinsic is just a hint to the optimizer.
// We still have an impl here to avoid it being turned into a call.
}

// Unimplemented intrinsics must have a fallback body. The fallback body is obtained
Expand Down
3 changes: 0 additions & 3 deletions compiler/rustc_const_eval/src/interpret/intrinsics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -417,9 +417,6 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
// These just return their argument
self.copy_op(&args[0], dest)?;
}
sym::cold_path => {
// This is a no-op. The intrinsic is just a hint to the optimizer.
}
sym::raw_eq => {
let result = self.raw_eq_intrinsic(&args[0], &args[1])?;
self.write_scalar(result, dest)?;
Expand Down
29 changes: 1 addition & 28 deletions compiler/rustc_middle/src/middle/stability.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ use rustc_attr::{
use rustc_data_structures::unord::UnordMap;
use rustc_errors::{Applicability, Diag, EmissionGuarantee};
use rustc_feature::GateIssue;
use rustc_hir::def::DefKind;
use rustc_hir::def_id::{DefId, LocalDefId, LocalDefIdMap};
use rustc_hir::{self as hir, HirId};
use rustc_macros::{Decodable, Encodable, HashStable, Subdiagnostic};
Expand All @@ -24,7 +23,7 @@ use rustc_span::symbol::{Symbol, sym};
use tracing::debug;

pub use self::StabilityLevel::*;
use crate::ty::{self, TyCtxt};
use crate::ty::TyCtxt;

#[derive(PartialEq, Clone, Copy, Debug)]
pub enum StabilityLevel {
Expand Down Expand Up @@ -273,22 +272,6 @@ pub enum EvalResult {
Unmarked,
}

// See issue #38412.
fn skip_stability_check_due_to_privacy(tcx: TyCtxt<'_>, def_id: DefId) -> bool {
if tcx.def_kind(def_id) == DefKind::TyParam {
// Have no visibility, considered public for the purpose of this check.
return false;
}
match tcx.visibility(def_id) {
// Must check stability for `pub` items.
ty::Visibility::Public => false,

// These are not visible outside crate; therefore
// stability markers are irrelevant, if even present.
ty::Visibility::Restricted(..) => true,
}
}

// See issue #83250.
fn suggestion_for_allocator_api(
tcx: TyCtxt<'_>,
Expand Down Expand Up @@ -407,11 +390,6 @@ impl<'tcx> TyCtxt<'tcx> {
def_id, span, stability
);

// Issue #38412: private items lack stability markers.
if skip_stability_check_due_to_privacy(self, def_id) {
return EvalResult::Allow;
}

match stability {
Some(Stability {
level: attr::Unstable { reason, issue, is_soft, implied_by },
Expand Down Expand Up @@ -495,11 +473,6 @@ impl<'tcx> TyCtxt<'tcx> {
"body stability: inspecting def_id={def_id:?} span={span:?} of stability={stability:?}"
);

// Issue #38412: private items lack stability markers.
if skip_stability_check_due_to_privacy(self, def_id) {
return EvalResult::Allow;
}

match stability {
Some(DefaultBodyStability {
level: attr::Unstable { reason, issue, is_soft, .. },
Expand Down
2 changes: 1 addition & 1 deletion config.example.toml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
# Indicates whether the LLVM plugin is enabled or not
#plugins = false

# Wheter to build Enzyme as AutoDiff backend.
# Whether to build Enzyme as AutoDiff backend.
#enzyme = false

# Whether to build LLVM with support for it's gpu offload runtime.
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/auxiliary/pub-and-stability.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
// The basic stability pattern in this file has four cases:
// 1. no stability attribute at all
// 2. a stable attribute (feature "unit_test")
// 3. an unstable attribute that unit test declares (feature "unstable_declared")
// 4. an unstable attribute that unit test fails to declare (feature "unstable_undeclared")
// 3. an unstable attribute that unit test enables (feature "unstable_declared")
// 4. an unstable attribute that unit test fails to enable (feature "unstable_undeclared")
//
// This file also covers four kinds of visibility: private,
// pub(module), pub(crate), and pub.
Expand Down
8 changes: 4 additions & 4 deletions tests/ui/explore-issue-38412.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
//@ aux-build:pub-and-stability.rs

// A big point of this test is that we *declare* `unstable_declared`,
// but do *not* declare `unstable_undeclared`. This way we can check
// that the compiler is letting in uses of declared feature-gated
// stuff but still rejecting uses of undeclared feature-gated stuff.
// A big point of this test is that we *enable* `unstable_declared`,
// but do *not* enable `unstable_undeclared`. This way we can check
// that the compiler is letting in uses of enabled feature-gated
// stuff but still rejecting uses of disabled feature-gated stuff.
#![feature(unstable_declared)]

extern crate pub_and_stability;
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/feature-gates/feature-gate-large-assignments.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// check that `move_size_limit is feature-gated
// check that `move_size_limit` is feature-gated

#![move_size_limit = "42"] //~ ERROR the `#[move_size_limit]` attribute is an experimental feature

Expand Down
27 changes: 21 additions & 6 deletions triagebot.toml
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,21 @@ trigger_files = [
"compiler",

# Tests
"tests/assembly",
"tests/auxiliary",
"tests/codegen",
"tests/codegen-units",
"tests/COMPILER_TESTS.md",
"tests/coverage",
"tests/coverage-run-rustdoc",
"tests/crashes",
"tests/debuginfo",
"tests/incremental",
"tests/mir-opt",
"tests/pretty",
"tests/run-make",
"tests/ui",
"tests/ui-fulldeps",
]
exclude_labels = [
"T-*",
Expand Down Expand Up @@ -353,21 +367,22 @@ trigger_files = [

[autolabel."T-bootstrap"]
trigger_files = [
"x.py",
"x",
"x.ps1",
"Cargo.toml",
"configure",
"config.example.toml",
"src/bootstrap",
"src/build_helper",
"src/tools/rust-installer",
"src/tools/x",
"configure",
"Cargo.toml",
"config.example.toml",
"src/stage0",
"src/tools/compiletest",
"src/tools/tidy",
"src/tools/rustdoc-gui-test",
"src/tools/libcxx-version",
"src/tools/rustc-perf-wrapper",
"x.py",
"x",
"x.ps1"
]

[autolabel."T-infra"]
Expand Down

0 comments on commit 03ee484

Please sign in to comment.