Skip to content

Commit 5b2e2f5

Browse files
borsbors
committed
Auto merge of #124140 - workingjubilee:rollup-wrub705, r=workingjubilee
Rollup of 6 pull requests Successful merges: - #117919 (Introduce perma-unstable `wasm-c-abi` flag) - #123571 (Correctly change type when adding adjustments on top of `NeverToAny`) - #123752 (Properly handle emojis as literal prefix in macros) - #123980 ( Add an opt-in to store incoming edges in `VecGraph` + misc) - #124110 (Fix negating `f16` and `f128` constants) - #124116 (when suggesting RUST_BACKTRACE=1, add a special note for Miri's env var isolation) r? `@ghost` `@rustbot` modify labels: rollup
2 parents e3181b0 + 8d5587e commit 5b2e2f5

File tree

60 files changed

+566
-132
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+566
-132
lines changed

‎compiler/rustc_codegen_gcc/src/builder.rs

+7-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ use rustc_span::Span;
3131
use rustc_target::abi::{
3232
self, call::FnAbi, Align, HasDataLayout, Size, TargetDataLayout, WrappingRange,
3333
};
34-
use rustc_target::spec::{HasTargetSpec, Target};
34+
use rustc_target::spec::{HasTargetSpec, HasWasmCAbiOpt, Target, WasmCAbi};
3535

3636
use crate::common::{type_is_pointer, SignType, TypeReflection};
3737
use crate::context::CodegenCx;
@@ -2352,6 +2352,12 @@ impl<'tcx> HasTargetSpec for Builder<'_, '_, 'tcx> {
23522352
}
23532353
}
23542354

2355+
impl<'tcx> HasWasmCAbiOpt for Builder<'_, '_, 'tcx> {
2356+
fn wasm_c_abi_opt(&self) -> WasmCAbi {
2357+
self.cx.wasm_c_abi_opt()
2358+
}
2359+
}
2360+
23552361
pub trait ToGccComp {
23562362
fn to_gcc_comparison(&self) -> ComparisonOp;
23572363
}

‎compiler/rustc_codegen_gcc/src/context.rs

+7-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ use rustc_span::{source_map::respan, Span};
2020
use rustc_target::abi::{
2121
call::FnAbi, HasDataLayout, PointeeInfo, Size, TargetDataLayout, VariantIdx,
2222
};
23-
use rustc_target::spec::{HasTargetSpec, Target, TlsModel};
23+
use rustc_target::spec::{HasTargetSpec, HasWasmCAbiOpt, Target, TlsModel, WasmCAbi};
2424

2525
use crate::callee::get_fn;
2626
use crate::common::SignType;
@@ -557,6 +557,12 @@ impl<'gcc, 'tcx> HasTargetSpec for CodegenCx<'gcc, 'tcx> {
557557
}
558558
}
559559

560+
impl<'gcc, 'tcx> HasWasmCAbiOpt for CodegenCx<'gcc, 'tcx> {
561+
fn wasm_c_abi_opt(&self) -> WasmCAbi {
562+
self.tcx.sess.opts.unstable_opts.wasm_c_abi
563+
}
564+
}
565+
560566
impl<'gcc, 'tcx> LayoutOfHelpers<'tcx> for CodegenCx<'gcc, 'tcx> {
561567
type LayoutOfResult = TyAndLayout<'tcx>;
562568

‎compiler/rustc_data_structures/src/graph/iterate/mod.rs

+11-11
Original file line numberDiff line numberDiff line change
@@ -70,21 +70,21 @@ pub fn reverse_post_order<G: DirectedGraph + Successors>(
7070
}
7171

7272
/// A "depth-first search" iterator for a directed graph.
73-
pub struct DepthFirstSearch<'graph, G>
73+
pub struct DepthFirstSearch<G>
7474
where
75-
G: ?Sized + DirectedGraph + Successors,
75+
G: DirectedGraph + Successors,
7676
{
77-
graph: &'graph G,
77+
graph: G,
7878
stack: Vec<G::Node>,
7979
visited: BitSet<G::Node>,
8080
}
8181

82-
impl<'graph, G> DepthFirstSearch<'graph, G>
82+
impl<G> DepthFirstSearch<G>
8383
where
84-
G: ?Sized + DirectedGraph + Successors,
84+
G: DirectedGraph + Successors,
8585
{
86-
pub fn new(graph: &'graph G) -> Self {
87-
Self { graph, stack: vec![], visited: BitSet::new_empty(graph.num_nodes()) }
86+
pub fn new(graph: G) -> Self {
87+
Self { stack: vec![], visited: BitSet::new_empty(graph.num_nodes()), graph }
8888
}
8989

9090
/// Version of `push_start_node` that is convenient for chained
@@ -125,9 +125,9 @@ where
125125
}
126126
}
127127

128-
impl<G> std::fmt::Debug for DepthFirstSearch<'_, G>
128+
impl<G> std::fmt::Debug for DepthFirstSearch<G>
129129
where
130-
G: ?Sized + DirectedGraph + Successors,
130+
G: DirectedGraph + Successors,
131131
{
132132
fn fmt(&self, fmt: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
133133
let mut f = fmt.debug_set();
@@ -138,9 +138,9 @@ where
138138
}
139139
}
140140

141-
impl<G> Iterator for DepthFirstSearch<'_, G>
141+
impl<G> Iterator for DepthFirstSearch<G>
142142
where
143-
G: ?Sized + DirectedGraph + Successors,
143+
G: DirectedGraph + Successors,
144144
{
145145
type Item = G::Node;
146146

‎compiler/rustc_data_structures/src/graph/mod.rs

+28-2
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,35 @@ where
4646
.is_some()
4747
}
4848

49-
pub fn depth_first_search<G>(graph: &G, from: G::Node) -> iterate::DepthFirstSearch<'_, G>
49+
pub fn depth_first_search<G>(graph: G, from: G::Node) -> iterate::DepthFirstSearch<G>
5050
where
51-
G: ?Sized + Successors,
51+
G: Successors,
5252
{
5353
iterate::DepthFirstSearch::new(graph).with_start_node(from)
5454
}
55+
56+
pub fn depth_first_search_as_undirected<G>(
57+
graph: G,
58+
from: G::Node,
59+
) -> iterate::DepthFirstSearch<impl Successors<Node = G::Node>>
60+
where
61+
G: Successors + Predecessors,
62+
{
63+
struct AsUndirected<G>(G);
64+
65+
impl<G: DirectedGraph> DirectedGraph for AsUndirected<G> {
66+
type Node = G::Node;
67+
68+
fn num_nodes(&self) -> usize {
69+
self.0.num_nodes()
70+
}
71+
}
72+
73+
impl<G: Successors + Predecessors> Successors for AsUndirected<G> {
74+
fn successors(&self, node: Self::Node) -> impl Iterator<Item = Self::Node> {
75+
self.0.successors(node).chain(self.0.predecessors(node))
76+
}
77+
}
78+
79+
iterate::DepthFirstSearch::new(AsUndirected(graph)).with_start_node(from)
80+
}

0 commit comments

Comments
 (0)