Ensure query keys are printed with reduced queries#141985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 2 commits into from
Jun 5, 2025
Merged

Ensure query keys are printed with reduced queries #141985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7db329
Add a test to reproduce ICE
compiler-errors Jun 3, 2025
cbb3a84
Ensure query keys are printed with reduced queries
compiler-errors May 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions compiler/rustc_middle/src/dep_graph/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ use rustc_data_structures::profiling::SelfProfilerRef;
use rustc_query_system::ich::StableHashingContext;
use rustc_session::Session;

use crate::ty::print::with_reduced_queries;
use crate::ty::{self, TyCtxt};

#[macro_use]
Expand DownExpand Up@@ -84,4 +85,8 @@ impl<'tcx> DepContext for TyCtxt<'tcx> {
fn dep_kind_info(&self, dk: DepKind) -> &DepKindStruct<'tcx> {
&self.query_kinds[dk.as_usize()]
}

fn with_reduced_queries<T>(self, f: impl FnOnce() -> T) -> T {
with_reduced_queries!(f())
}
}
2 changes: 1 addition & 1 deletion compiler/rustc_middle/src/ty/print/pretty.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1886,7 +1886,7 @@ pub trait PrettyPrinter<'tcx>: Printer<'tcx> + fmt::Write {
) -> Result<(), PrintError> {
define_scoped_cx!(self);

if self.should_print_verbose() {
if with_reduced_queries() || self.should_print_verbose() {
p!(write("ValTree({:?}: ", cv.valtree), print(cv.ty), ")");
return Ok(());
}
Expand Down
11 changes: 6 additions & 5 deletions compiler/rustc_query_system/src/dep_graph/dep_node.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -178,9 +178,7 @@ pub trait DepNodeParams<Tcx: DepContext>: fmt::Debug + Sized {
panic!("Not implemented. Accidentally called on anonymous node?")
}

fn to_debug_str(&self, _: Tcx) -> String {
format!("{self:?}")
}
fn to_debug_str(&self, tcx: Tcx) -> String;

/// This method tries to recover the query key from the given `DepNode`,
/// something which is needed when forcing `DepNode`s during red-green
Expand DownExpand Up@@ -210,8 +208,11 @@ where
}

#[inline(always)]
default fn to_debug_str(&self, _: Tcx) -> String {
format!("{:?}", *self)
default fn to_debug_str(&self, tcx: Tcx) -> String {
// Make sure to print dep node params with reduced queries since printing
// may themselves call queries, which may lead to (possibly untracked!)
// query cycles.
tcx.with_reduced_queries(|| format!("{self:?}"))
}

#[inline(always)]
Expand Down
2 changes: 2 additions & 0 deletions compiler/rustc_query_system/src/dep_graph/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,8 @@ pub trait DepContext: Copy {
f(self, dep_node)
}
}

fn with_reduced_queries<T>(self, _: impl FnOnce() -> T) -> T;
}

pub trait Deps: DynSync {
Expand Down
25 changes: 25 additions & 0 deletions tests/incremental/print-dep-node-cycle.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
//@ compile-flags: -Z query-dep-graph
//@ revisions: rpass1

// Exercises a debug-assertions-only query cycle that when printing a valtree const in
// a dep node's debug representation, we end up invoking a query that also has a valtree
// const in its dep node's debug representation, which leads to a cycle (and ICE, since
// deps are not tracked when printing dep nodes' debug representations).

#![feature(adt_const_params)]

use std::marker::ConstParamTy;

#[derive(Debug, ConstParamTy, PartialEq, Eq)]
enum Foo {
A1,
}

#[inline(never)]
fn hello<const F: Foo>() {
println!("{:#?}", F);
}

fn main() {
hello::<{ Foo::A1 }>();
}
2 changes: 1 addition & 1 deletion tests/ui/transmutability/structs/repr/transmute_infinitely_recursive_type.stderr
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ LL | struct ExplicitlyPadded(Box<ExplicitlyPadded>);
error[E0391]: cycle detected when computing layout of `should_pad_explicitly_packed_field::ExplicitlyPadded`
|
= note: ...which immediately requires computing layout of `should_pad_explicitly_packed_field::ExplicitlyPadded` again
= note: cycle used when evaluating trait selection obligation `(): core::mem::transmutability::TransmuteFrom<should_pad_explicitly_packed_field::ExplicitlyPadded, core::mem::transmutability::Assume { alignment: false, lifetimes: false, safety: false, validity: false }>`
= note: cycle used when evaluating trait selection obligation `(): core::mem::transmutability::TransmuteFrom<should_pad_explicitly_packed_field::ExplicitlyPadded, ValTree(Branch([Leaf(0x00), Leaf(0x00), Leaf(0x00), Leaf(0x00)]): core::mem::transmutability::Assume)>`
= note: see https://rustc-dev-guide.rust-lang.org/overview.html#queries and https://rustc-dev-guide.rust-lang.org/query.html for more information

error: aborting due to 2 previous errors
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Ensure query keys are printed with reduced queries#141985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

bors
merged 2 commits into

from

Jun 5, 2025
 Merged


Ensure query keys are printed with reduced queries
#141985
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f7db329

Add a test to reproduce ICE


compiler-errors Jun 3, 2025
cbb3a84

Ensure query keys are printed with reduced queries


compiler-errors May 31, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
compiler/rustc_middle/src/dep_graph/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ use rustc_data_structures::profiling::SelfProfilerRef;
use rustc_query_system::ich::StableHashingContext;
use rustc_session::Session;

use crate::ty::print::with_reduced_queries;
use crate::ty::{self, TyCtxt};

#[macro_use]
Expand DownExpand Up@@ -84,4 +85,8 @@ impl<'tcx> DepContext for TyCtxt<'tcx> {
 fn dep_kind_info(&self, dk: DepKind) -> &DepKindStruct<'tcx> {
 &self.query_kinds[dk.as_usize()]
 }

 fn with_reduced_queries<T>(self, f: impl FnOnce() -> T) -> T {
 with_reduced_queries!(f())
 }
}

2 changes: 1 addition & 1 deletion
compiler/rustc_middle/src/ty/print/pretty.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1886,7 +1886,7 @@ pub trait PrettyPrinter<'tcx>: Printer<'tcx> + fmt::Write {
 ) -> Result<(), PrintError> {
 define_scoped_cx!(self);

 if self.should_print_verbose() {
 if with_reduced_queries() || self.should_print_verbose() {
 p!(write("ValTree({:?}: ", cv.valtree), print(cv.ty), ")");
 return Ok(());
 }
Expand Down

11 changes: 6 additions & 5 deletions
compiler/rustc_query_system/src/dep_graph/dep_node.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,9 +178,7 @@ pub trait DepNodeParams<Tcx: DepContext>: fmt::Debug + Sized {
 panic!("Not implemented. Accidentally called on anonymous node?")
 }

 fn to_debug_str(&self, _: Tcx) -> String {
 format!("{self:?}")
 }
 fn to_debug_str(&self, tcx: Tcx) -> String;

 /// This method tries to recover the query key from the given `DepNode`,
 /// something which is needed when forcing `DepNode`s during red-green
Expand DownExpand Up@@ -210,8 +208,11 @@ where
 }

 #[inline(always)]
 default fn to_debug_str(&self, _: Tcx) -> String {
 format!("{:?}", *self)
 default fn to_debug_str(&self, tcx: Tcx) -> String {
 // Make sure to print dep node params with reduced queries since printing
 // may themselves call queries, which may lead to (possibly untracked!)
 // query cycles.
 tcx.with_reduced_queries(|| format!("{self:?}"))
 }

 #[inline(always)]
Expand Down

2 changes: 2 additions & 0 deletions
compiler/rustc_query_system/src/dep_graph/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,8 @@ pub trait DepContext: Copy {
 f(self, dep_node)
 }
 }

 fn with_reduced_queries<T>(self, _: impl FnOnce() -> T) -> T;
}

pub trait Deps: DynSync {
Expand Down

25 changes: 25 additions & 0 deletions
tests/incremental/print-dep-node-cycle.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
//@ compile-flags: -Z query-dep-graph
//@ revisions: rpass1

// Exercises a debug-assertions-only query cycle that when printing a valtree const in
// a dep node's debug representation, we end up invoking a query that also has a valtree
// const in its dep node's debug representation, which leads to a cycle (and ICE, since
// deps are not tracked when printing dep nodes' debug representations).

#![feature(adt_const_params)]

use std::marker::ConstParamTy;

#[derive(Debug, ConstParamTy, PartialEq, Eq)]
enum Foo {
 A1,
}

#[inline(never)]
fn hello<const F: Foo>() {
 println!("{:#?}", F);
}

fn main() {
 hello::<{ Foo::A1 }>();
}

2 changes: 1 addition & 1 deletion
tests/ui/transmutability/structs/repr/transmute_infinitely_recursive_type.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ LL | struct ExplicitlyPadded(Box<ExplicitlyPadded>);
error[E0391]: cycle detected when computing layout of `should_pad_explicitly_packed_field::ExplicitlyPadded`
 |
 = note: ...which immediately requires computing layout of `should_pad_explicitly_packed_field::ExplicitlyPadded` again
 = note: cycle used when evaluating trait selection obligation `(): core::mem::transmutability::TransmuteFrom<should_pad_explicitly_packed_field::ExplicitlyPadded, core::mem::transmutability::Assume { alignment: false, lifetimes: false, safety: false, validity: false }>`
 = note: cycle used when evaluating trait selection obligation `(): core::mem::transmutability::TransmuteFrom<should_pad_explicitly_packed_field::ExplicitlyPadded, ValTree(Branch([Leaf(0x00), Leaf(0x00), Leaf(0x00), Leaf(0x00)]): core::mem::transmutability::Assume)>`
 = note: see https://rustc-dev-guide.rust-lang.org/overview.html#queries and https://rustc-dev-guide.rust-lang.org/query.html for more information

error: aborting due to 2 previous errors
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Ensure query keys are printed with reduced queries#141985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

bors
merged 2 commits into

from

Jun 5, 2025
 Merged


Ensure query keys are printed with reduced queries
#141985
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f7db329

Add a test to reproduce ICE


compiler-errors Jun 3, 2025
cbb3a84

Ensure query keys are printed with reduced queries


compiler-errors May 31, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
compiler/rustc_middle/src/dep_graph/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ use rustc_data_structures::profiling::SelfProfilerRef;
use rustc_query_system::ich::StableHashingContext;
use rustc_session::Session;

use crate::ty::print::with_reduced_queries;
use crate::ty::{self, TyCtxt};

#[macro_use]
Expand DownExpand Up@@ -84,4 +85,8 @@ impl<'tcx> DepContext for TyCtxt<'tcx> {
 fn dep_kind_info(&self, dk: DepKind) -> &DepKindStruct<'tcx> {
 &self.query_kinds[dk.as_usize()]
 }

 fn with_reduced_queries<T>(self, f: impl FnOnce() -> T) -> T {
 with_reduced_queries!(f())
 }
}

2 changes: 1 addition & 1 deletion
compiler/rustc_middle/src/ty/print/pretty.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1886,7 +1886,7 @@ pub trait PrettyPrinter<'tcx>: Printer<'tcx> + fmt::Write {
 ) -> Result<(), PrintError> {
 define_scoped_cx!(self);

 if self.should_print_verbose() {
 if with_reduced_queries() || self.should_print_verbose() {
 p!(write("ValTree({:?}: ", cv.valtree), print(cv.ty), ")");
 return Ok(());
 }
Expand Down

11 changes: 6 additions & 5 deletions
compiler/rustc_query_system/src/dep_graph/dep_node.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,9 +178,7 @@ pub trait DepNodeParams<Tcx: DepContext>: fmt::Debug + Sized {
 panic!("Not implemented. Accidentally called on anonymous node?")
 }

 fn to_debug_str(&self, _: Tcx) -> String {
 format!("{self:?}")
 }
 fn to_debug_str(&self, tcx: Tcx) -> String;

 /// This method tries to recover the query key from the given `DepNode`,
 /// something which is needed when forcing `DepNode`s during red-green
Expand DownExpand Up@@ -210,8 +208,11 @@ where
 }

 #[inline(always)]
 default fn to_debug_str(&self, _: Tcx) -> String {
 format!("{:?}", *self)
 default fn to_debug_str(&self, tcx: Tcx) -> String {
 // Make sure to print dep node params with reduced queries since printing
 // may themselves call queries, which may lead to (possibly untracked!)
 // query cycles.
 tcx.with_reduced_queries(|| format!("{self:?}"))
 }

 #[inline(always)]
Expand Down

2 changes: 2 additions & 0 deletions
compiler/rustc_query_system/src/dep_graph/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,8 @@ pub trait DepContext: Copy {
 f(self, dep_node)
 }
 }

 fn with_reduced_queries<T>(self, _: impl FnOnce() -> T) -> T;
}

pub trait Deps: DynSync {
Expand Down

25 changes: 25 additions & 0 deletions
tests/incremental/print-dep-node-cycle.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
//@ compile-flags: -Z query-dep-graph
//@ revisions: rpass1

// Exercises a debug-assertions-only query cycle that when printing a valtree const in
// a dep node's debug representation, we end up invoking a query that also has a valtree
// const in its dep node's debug representation, which leads to a cycle (and ICE, since
// deps are not tracked when printing dep nodes' debug representations).

#![feature(adt_const_params)]

use std::marker::ConstParamTy;

#[derive(Debug, ConstParamTy, PartialEq, Eq)]
enum Foo {
 A1,
}

#[inline(never)]
fn hello<const F: Foo>() {
 println!("{:#?}", F);
}

fn main() {
 hello::<{ Foo::A1 }>();
}

2 changes: 1 addition & 1 deletion
tests/ui/transmutability/structs/repr/transmute_infinitely_recursive_type.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ LL | struct ExplicitlyPadded(Box<ExplicitlyPadded>);
error[E0391]: cycle detected when computing layout of `should_pad_explicitly_packed_field::ExplicitlyPadded`
 |
 = note: ...which immediately requires computing layout of `should_pad_explicitly_packed_field::ExplicitlyPadded` again
 = note: cycle used when evaluating trait selection obligation `(): core::mem::transmutability::TransmuteFrom<should_pad_explicitly_packed_field::ExplicitlyPadded, core::mem::transmutability::Assume { alignment: false, lifetimes: false, safety: false, validity: false }>`
 = note: cycle used when evaluating trait selection obligation `(): core::mem::transmutability::TransmuteFrom<should_pad_explicitly_packed_field::ExplicitlyPadded, ValTree(Branch([Leaf(0x00), Leaf(0x00), Leaf(0x00), Leaf(0x00)]): core::mem::transmutability::Assume)>`
 = note: see https://rustc-dev-guide.rust-lang.org/overview.html#queries and https://rustc-dev-guide.rust-lang.org/query.html for more information

error: aborting due to 2 previous errors
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Ensure query keys are printed with reduced queries#141985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

bors
merged 2 commits into

from

Jun 5, 2025
 Merged


Ensure query keys are printed with reduced queries
#141985
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f7db329

Add a test to reproduce ICE


compiler-errors Jun 3, 2025
cbb3a84

Ensure query keys are printed with reduced queries


compiler-errors May 31, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
compiler/rustc_middle/src/dep_graph/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ use rustc_data_structures::profiling::SelfProfilerRef;
use rustc_query_system::ich::StableHashingContext;
use rustc_session::Session;

use crate::ty::print::with_reduced_queries;
use crate::ty::{self, TyCtxt};

#[macro_use]
Expand DownExpand Up@@ -84,4 +85,8 @@ impl<'tcx> DepContext for TyCtxt<'tcx> {
 fn dep_kind_info(&self, dk: DepKind) -> &DepKindStruct<'tcx> {
 &self.query_kinds[dk.as_usize()]
 }

 fn with_reduced_queries<T>(self, f: impl FnOnce() -> T) -> T {
 with_reduced_queries!(f())
 }
}

2 changes: 1 addition & 1 deletion
compiler/rustc_middle/src/ty/print/pretty.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1886,7 +1886,7 @@ pub trait PrettyPrinter<'tcx>: Printer<'tcx> + fmt::Write {
 ) -> Result<(), PrintError> {
 define_scoped_cx!(self);

 if self.should_print_verbose() {
 if with_reduced_queries() || self.should_print_verbose() {
 p!(write("ValTree({:?}: ", cv.valtree), print(cv.ty), ")");
 return Ok(());
 }
Expand Down

11 changes: 6 additions & 5 deletions
compiler/rustc_query_system/src/dep_graph/dep_node.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,9 +178,7 @@ pub trait DepNodeParams<Tcx: DepContext>: fmt::Debug + Sized {
 panic!("Not implemented. Accidentally called on anonymous node?")
 }

 fn to_debug_str(&self, _: Tcx) -> String {
 format!("{self:?}")
 }
 fn to_debug_str(&self, tcx: Tcx) -> String;

 /// This method tries to recover the query key from the given `DepNode`,
 /// something which is needed when forcing `DepNode`s during red-green
Expand DownExpand Up@@ -210,8 +208,11 @@ where
 }

 #[inline(always)]
 default fn to_debug_str(&self, _: Tcx) -> String {
 format!("{:?}", *self)
 default fn to_debug_str(&self, tcx: Tcx) -> String {
 // Make sure to print dep node params with reduced queries since printing
 // may themselves call queries, which may lead to (possibly untracked!)
 // query cycles.
 tcx.with_reduced_queries(|| format!("{self:?}"))
 }

 #[inline(always)]
Expand Down

2 changes: 2 additions & 0 deletions
compiler/rustc_query_system/src/dep_graph/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,8 @@ pub trait DepContext: Copy {
 f(self, dep_node)
 }
 }

 fn with_reduced_queries<T>(self, _: impl FnOnce() -> T) -> T;
}

pub trait Deps: DynSync {
Expand Down

25 changes: 25 additions & 0 deletions
tests/incremental/print-dep-node-cycle.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
//@ compile-flags: -Z query-dep-graph
//@ revisions: rpass1

// Exercises a debug-assertions-only query cycle that when printing a valtree const in
// a dep node's debug representation, we end up invoking a query that also has a valtree
// const in its dep node's debug representation, which leads to a cycle (and ICE, since
// deps are not tracked when printing dep nodes' debug representations).

#![feature(adt_const_params)]

use std::marker::ConstParamTy;

#[derive(Debug, ConstParamTy, PartialEq, Eq)]
enum Foo {
 A1,
}

#[inline(never)]
fn hello<const F: Foo>() {
 println!("{:#?}", F);
}

fn main() {
 hello::<{ Foo::A1 }>();
}

2 changes: 1 addition & 1 deletion
tests/ui/transmutability/structs/repr/transmute_infinitely_recursive_type.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ LL | struct ExplicitlyPadded(Box<ExplicitlyPadded>);
error[E0391]: cycle detected when computing layout of `should_pad_explicitly_packed_field::ExplicitlyPadded`
 |
 = note: ...which immediately requires computing layout of `should_pad_explicitly_packed_field::ExplicitlyPadded` again
 = note: cycle used when evaluating trait selection obligation `(): core::mem::transmutability::TransmuteFrom<should_pad_explicitly_packed_field::ExplicitlyPadded, core::mem::transmutability::Assume { alignment: false, lifetimes: false, safety: false, validity: false }>`
 = note: cycle used when evaluating trait selection obligation `(): core::mem::transmutability::TransmuteFrom<should_pad_explicitly_packed_field::ExplicitlyPadded, ValTree(Branch([Leaf(0x00), Leaf(0x00), Leaf(0x00), Leaf(0x00)]): core::mem::transmutability::Assume)>`
 = note: see https://rustc-dev-guide.rust-lang.org/overview.html#queries and https://rustc-dev-guide.rust-lang.org/query.html for more information

error: aborting due to 2 previous errors
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Ensure query keys are printed with reduced queries#141985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

bors
merged 2 commits into

from

Jun 5, 2025
 Merged


Ensure query keys are printed with reduced queries
#141985
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f7db329

Add a test to reproduce ICE


compiler-errors Jun 3, 2025
cbb3a84

Ensure query keys are printed with reduced queries


compiler-errors May 31, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
compiler/rustc_middle/src/dep_graph/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ use rustc_data_structures::profiling::SelfProfilerRef;
use rustc_query_system::ich::StableHashingContext;
use rustc_session::Session;

use crate::ty::print::with_reduced_queries;
use crate::ty::{self, TyCtxt};

#[macro_use]
Expand DownExpand Up@@ -84,4 +85,8 @@ impl<'tcx> DepContext for TyCtxt<'tcx> {
 fn dep_kind_info(&self, dk: DepKind) -> &DepKindStruct<'tcx> {
 &self.query_kinds[dk.as_usize()]
 }

 fn with_reduced_queries<T>(self, f: impl FnOnce() -> T) -> T {
 with_reduced_queries!(f())
 }
}

2 changes: 1 addition & 1 deletion
compiler/rustc_middle/src/ty/print/pretty.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1886,7 +1886,7 @@ pub trait PrettyPrinter<'tcx>: Printer<'tcx> + fmt::Write {
 ) -> Result<(), PrintError> {
 define_scoped_cx!(self);

 if self.should_print_verbose() {
 if with_reduced_queries() || self.should_print_verbose() {
 p!(write("ValTree({:?}: ", cv.valtree), print(cv.ty), ")");
 return Ok(());
 }
Expand Down

11 changes: 6 additions & 5 deletions
compiler/rustc_query_system/src/dep_graph/dep_node.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,9 +178,7 @@ pub trait DepNodeParams<Tcx: DepContext>: fmt::Debug + Sized {
 panic!("Not implemented. Accidentally called on anonymous node?")
 }

 fn to_debug_str(&self, _: Tcx) -> String {
 format!("{self:?}")
 }
 fn to_debug_str(&self, tcx: Tcx) -> String;

 /// This method tries to recover the query key from the given `DepNode`,
 /// something which is needed when forcing `DepNode`s during red-green
Expand DownExpand Up@@ -210,8 +208,11 @@ where
 }

 #[inline(always)]
 default fn to_debug_str(&self, _: Tcx) -> String {
 format!("{:?}", *self)
 default fn to_debug_str(&self, tcx: Tcx) -> String {
 // Make sure to print dep node params with reduced queries since printing
 // may themselves call queries, which may lead to (possibly untracked!)
 // query cycles.
 tcx.with_reduced_queries(|| format!("{self:?}"))
 }

 #[inline(always)]
Expand Down

2 changes: 2 additions & 0 deletions
compiler/rustc_query_system/src/dep_graph/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,8 @@ pub trait DepContext: Copy {
 f(self, dep_node)
 }
 }

 fn with_reduced_queries<T>(self, _: impl FnOnce() -> T) -> T;
}

pub trait Deps: DynSync {
Expand Down

25 changes: 25 additions & 0 deletions
tests/incremental/print-dep-node-cycle.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
//@ compile-flags: -Z query-dep-graph
//@ revisions: rpass1

// Exercises a debug-assertions-only query cycle that when printing a valtree const in
// a dep node's debug representation, we end up invoking a query that also has a valtree
// const in its dep node's debug representation, which leads to a cycle (and ICE, since
// deps are not tracked when printing dep nodes' debug representations).

#![feature(adt_const_params)]

use std::marker::ConstParamTy;

#[derive(Debug, ConstParamTy, PartialEq, Eq)]
enum Foo {
 A1,
}

#[inline(never)]
fn hello<const F: Foo>() {
 println!("{:#?}", F);
}

fn main() {
 hello::<{ Foo::A1 }>();
}

2 changes: 1 addition & 1 deletion
tests/ui/transmutability/structs/repr/transmute_infinitely_recursive_type.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ LL | struct ExplicitlyPadded(Box<ExplicitlyPadded>);
error[E0391]: cycle detected when computing layout of `should_pad_explicitly_packed_field::ExplicitlyPadded`
 |
 = note: ...which immediately requires computing layout of `should_pad_explicitly_packed_field::ExplicitlyPadded` again
 = note: cycle used when evaluating trait selection obligation `(): core::mem::transmutability::TransmuteFrom<should_pad_explicitly_packed_field::ExplicitlyPadded, core::mem::transmutability::Assume { alignment: false, lifetimes: false, safety: false, validity: false }>`
 = note: cycle used when evaluating trait selection obligation `(): core::mem::transmutability::TransmuteFrom<should_pad_explicitly_packed_field::ExplicitlyPadded, ValTree(Branch([Leaf(0x00), Leaf(0x00), Leaf(0x00), Leaf(0x00)]): core::mem::transmutability::Assume)>`
 = note: see https://rustc-dev-guide.rust-lang.org/overview.html#queries and https://rustc-dev-guide.rust-lang.org/query.html for more information

error: aborting due to 2 previous errors
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Ensure query keys are printed with reduced queries#141985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

bors
merged 2 commits into

from

Jun 5, 2025
 Merged


Ensure query keys are printed with reduced queries
#141985
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f7db329

Add a test to reproduce ICE


compiler-errors Jun 3, 2025
cbb3a84

Ensure query keys are printed with reduced queries


compiler-errors May 31, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
compiler/rustc_middle/src/dep_graph/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ use rustc_data_structures::profiling::SelfProfilerRef;
use rustc_query_system::ich::StableHashingContext;
use rustc_session::Session;

use crate::ty::print::with_reduced_queries;
use crate::ty::{self, TyCtxt};

#[macro_use]
Expand DownExpand Up@@ -84,4 +85,8 @@ impl<'tcx> DepContext for TyCtxt<'tcx> {
 fn dep_kind_info(&self, dk: DepKind) -> &DepKindStruct<'tcx> {
 &self.query_kinds[dk.as_usize()]
 }

 fn with_reduced_queries<T>(self, f: impl FnOnce() -> T) -> T {
 with_reduced_queries!(f())
 }
}

2 changes: 1 addition & 1 deletion
compiler/rustc_middle/src/ty/print/pretty.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1886,7 +1886,7 @@ pub trait PrettyPrinter<'tcx>: Printer<'tcx> + fmt::Write {
 ) -> Result<(), PrintError> {
 define_scoped_cx!(self);

 if self.should_print_verbose() {
 if with_reduced_queries() || self.should_print_verbose() {
 p!(write("ValTree({:?}: ", cv.valtree), print(cv.ty), ")");
 return Ok(());
 }
Expand Down

11 changes: 6 additions & 5 deletions
compiler/rustc_query_system/src/dep_graph/dep_node.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,9 +178,7 @@ pub trait DepNodeParams<Tcx: DepContext>: fmt::Debug + Sized {
 panic!("Not implemented. Accidentally called on anonymous node?")
 }

 fn to_debug_str(&self, _: Tcx) -> String {
 format!("{self:?}")
 }
 fn to_debug_str(&self, tcx: Tcx) -> String;

 /// This method tries to recover the query key from the given `DepNode`,
 /// something which is needed when forcing `DepNode`s during red-green
Expand DownExpand Up@@ -210,8 +208,11 @@ where
 }

 #[inline(always)]
 default fn to_debug_str(&self, _: Tcx) -> String {
 format!("{:?}", *self)
 default fn to_debug_str(&self, tcx: Tcx) -> String {
 // Make sure to print dep node params with reduced queries since printing
 // may themselves call queries, which may lead to (possibly untracked!)
 // query cycles.
 tcx.with_reduced_queries(|| format!("{self:?}"))
 }

 #[inline(always)]
Expand Down

2 changes: 2 additions & 0 deletions
compiler/rustc_query_system/src/dep_graph/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,8 @@ pub trait DepContext: Copy {
 f(self, dep_node)
 }
 }

 fn with_reduced_queries<T>(self, _: impl FnOnce() -> T) -> T;
}

pub trait Deps: DynSync {
Expand Down

25 changes: 25 additions & 0 deletions
tests/incremental/print-dep-node-cycle.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
//@ compile-flags: -Z query-dep-graph
//@ revisions: rpass1

// Exercises a debug-assertions-only query cycle that when printing a valtree const in
// a dep node's debug representation, we end up invoking a query that also has a valtree
// const in its dep node's debug representation, which leads to a cycle (and ICE, since
// deps are not tracked when printing dep nodes' debug representations).

#![feature(adt_const_params)]

use std::marker::ConstParamTy;

#[derive(Debug, ConstParamTy, PartialEq, Eq)]
enum Foo {
 A1,
}

#[inline(never)]
fn hello<const F: Foo>() {
 println!("{:#?}", F);
}

fn main() {
 hello::<{ Foo::A1 }>();
}

2 changes: 1 addition & 1 deletion
tests/ui/transmutability/structs/repr/transmute_infinitely_recursive_type.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ LL | struct ExplicitlyPadded(Box<ExplicitlyPadded>);
error[E0391]: cycle detected when computing layout of `should_pad_explicitly_packed_field::ExplicitlyPadded`
 |
 = note: ...which immediately requires computing layout of `should_pad_explicitly_packed_field::ExplicitlyPadded` again
 = note: cycle used when evaluating trait selection obligation `(): core::mem::transmutability::TransmuteFrom<should_pad_explicitly_packed_field::ExplicitlyPadded, core::mem::transmutability::Assume { alignment: false, lifetimes: false, safety: false, validity: false }>`
 = note: cycle used when evaluating trait selection obligation `(): core::mem::transmutability::TransmuteFrom<should_pad_explicitly_packed_field::ExplicitlyPadded, ValTree(Branch([Leaf(0x00), Leaf(0x00), Leaf(0x00), Leaf(0x00)]): core::mem::transmutability::Assume)>`
 = note: see https://rustc-dev-guide.rust-lang.org/overview.html#queries and https://rustc-dev-guide.rust-lang.org/query.html for more information

error: aborting due to 2 previous errors
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Ensure query keys are printed with reduced queries#141985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

bors
merged 2 commits into

from

Jun 5, 2025
 Merged


Ensure query keys are printed with reduced queries
#141985
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f7db329

Add a test to reproduce ICE


compiler-errors Jun 3, 2025
cbb3a84

Ensure query keys are printed with reduced queries


compiler-errors May 31, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
compiler/rustc_middle/src/dep_graph/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ use rustc_data_structures::profiling::SelfProfilerRef;
use rustc_query_system::ich::StableHashingContext;
use rustc_session::Session;

use crate::ty::print::with_reduced_queries;
use crate::ty::{self, TyCtxt};

#[macro_use]
Expand DownExpand Up@@ -84,4 +85,8 @@ impl<'tcx> DepContext for TyCtxt<'tcx> {
 fn dep_kind_info(&self, dk: DepKind) -> &DepKindStruct<'tcx> {
 &self.query_kinds[dk.as_usize()]
 }

 fn with_reduced_queries<T>(self, f: impl FnOnce() -> T) -> T {
 with_reduced_queries!(f())
 }
}

2 changes: 1 addition & 1 deletion
compiler/rustc_middle/src/ty/print/pretty.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1886,7 +1886,7 @@ pub trait PrettyPrinter<'tcx>: Printer<'tcx> + fmt::Write {
 ) -> Result<(), PrintError> {
 define_scoped_cx!(self);

 if self.should_print_verbose() {
 if with_reduced_queries() || self.should_print_verbose() {
 p!(write("ValTree({:?}: ", cv.valtree), print(cv.ty), ")");
 return Ok(());
 }
Expand Down

11 changes: 6 additions & 5 deletions
compiler/rustc_query_system/src/dep_graph/dep_node.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,9 +178,7 @@ pub trait DepNodeParams<Tcx: DepContext>: fmt::Debug + Sized {
 panic!("Not implemented. Accidentally called on anonymous node?")
 }

 fn to_debug_str(&self, _: Tcx) -> String {
 format!("{self:?}")
 }
 fn to_debug_str(&self, tcx: Tcx) -> String;

 /// This method tries to recover the query key from the given `DepNode`,
 /// something which is needed when forcing `DepNode`s during red-green
Expand DownExpand Up@@ -210,8 +208,11 @@ where
 }

 #[inline(always)]
 default fn to_debug_str(&self, _: Tcx) -> String {
 format!("{:?}", *self)
 default fn to_debug_str(&self, tcx: Tcx) -> String {
 // Make sure to print dep node params with reduced queries since printing
 // may themselves call queries, which may lead to (possibly untracked!)
 // query cycles.
 tcx.with_reduced_queries(|| format!("{self:?}"))
 }

 #[inline(always)]
Expand Down

2 changes: 2 additions & 0 deletions
compiler/rustc_query_system/src/dep_graph/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,8 @@ pub trait DepContext: Copy {
 f(self, dep_node)
 }
 }

 fn with_reduced_queries<T>(self, _: impl FnOnce() -> T) -> T;
}

pub trait Deps: DynSync {
Expand Down

25 changes: 25 additions & 0 deletions
tests/incremental/print-dep-node-cycle.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
//@ compile-flags: -Z query-dep-graph
//@ revisions: rpass1

// Exercises a debug-assertions-only query cycle that when printing a valtree const in
// a dep node's debug representation, we end up invoking a query that also has a valtree
// const in its dep node's debug representation, which leads to a cycle (and ICE, since
// deps are not tracked when printing dep nodes' debug representations).

#![feature(adt_const_params)]

use std::marker::ConstParamTy;

#[derive(Debug, ConstParamTy, PartialEq, Eq)]
enum Foo {
 A1,
}

#[inline(never)]
fn hello<const F: Foo>() {
 println!("{:#?}", F);
}

fn main() {
 hello::<{ Foo::A1 }>();
}

2 changes: 1 addition & 1 deletion
tests/ui/transmutability/structs/repr/transmute_infinitely_recursive_type.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ LL | struct ExplicitlyPadded(Box<ExplicitlyPadded>);
error[E0391]: cycle detected when computing layout of `should_pad_explicitly_packed_field::ExplicitlyPadded`
 |
 = note: ...which immediately requires computing layout of `should_pad_explicitly_packed_field::ExplicitlyPadded` again
 = note: cycle used when evaluating trait selection obligation `(): core::mem::transmutability::TransmuteFrom<should_pad_explicitly_packed_field::ExplicitlyPadded, core::mem::transmutability::Assume { alignment: false, lifetimes: false, safety: false, validity: false }>`
 = note: cycle used when evaluating trait selection obligation `(): core::mem::transmutability::TransmuteFrom<should_pad_explicitly_packed_field::ExplicitlyPadded, ValTree(Branch([Leaf(0x00), Leaf(0x00), Leaf(0x00), Leaf(0x00)]): core::mem::transmutability::Assume)>`
 = note: see https://rustc-dev-guide.rust-lang.org/overview.html#queries and https://rustc-dev-guide.rust-lang.org/query.html for more information

error: aborting due to 2 previous errors
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Ensure query keys are printed with reduced queries#141985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

bors
merged 2 commits into

from

Jun 5, 2025
 Merged


Ensure query keys are printed with reduced queries
#141985
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f7db329

Add a test to reproduce ICE


compiler-errors Jun 3, 2025
cbb3a84

Ensure query keys are printed with reduced queries


compiler-errors May 31, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
compiler/rustc_middle/src/dep_graph/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ use rustc_data_structures::profiling::SelfProfilerRef;
use rustc_query_system::ich::StableHashingContext;
use rustc_session::Session;

use crate::ty::print::with_reduced_queries;
use crate::ty::{self, TyCtxt};

#[macro_use]
Expand DownExpand Up@@ -84,4 +85,8 @@ impl<'tcx> DepContext for TyCtxt<'tcx> {
 fn dep_kind_info(&self, dk: DepKind) -> &DepKindStruct<'tcx> {
 &self.query_kinds[dk.as_usize()]
 }

 fn with_reduced_queries<T>(self, f: impl FnOnce() -> T) -> T {
 with_reduced_queries!(f())
 }
}

2 changes: 1 addition & 1 deletion
compiler/rustc_middle/src/ty/print/pretty.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1886,7 +1886,7 @@ pub trait PrettyPrinter<'tcx>: Printer<'tcx> + fmt::Write {
 ) -> Result<(), PrintError> {
 define_scoped_cx!(self);

 if self.should_print_verbose() {
 if with_reduced_queries() || self.should_print_verbose() {
 p!(write("ValTree({:?}: ", cv.valtree), print(cv.ty), ")");
 return Ok(());
 }
Expand Down

11 changes: 6 additions & 5 deletions
compiler/rustc_query_system/src/dep_graph/dep_node.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,9 +178,7 @@ pub trait DepNodeParams<Tcx: DepContext>: fmt::Debug + Sized {
 panic!("Not implemented. Accidentally called on anonymous node?")
 }

 fn to_debug_str(&self, _: Tcx) -> String {
 format!("{self:?}")
 }
 fn to_debug_str(&self, tcx: Tcx) -> String;

 /// This method tries to recover the query key from the given `DepNode`,
 /// something which is needed when forcing `DepNode`s during red-green
Expand DownExpand Up@@ -210,8 +208,11 @@ where
 }

 #[inline(always)]
 default fn to_debug_str(&self, _: Tcx) -> String {
 format!("{:?}", *self)
 default fn to_debug_str(&self, tcx: Tcx) -> String {
 // Make sure to print dep node params with reduced queries since printing
 // may themselves call queries, which may lead to (possibly untracked!)
 // query cycles.
 tcx.with_reduced_queries(|| format!("{self:?}"))
 }

 #[inline(always)]
Expand Down

2 changes: 2 additions & 0 deletions
compiler/rustc_query_system/src/dep_graph/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,8 @@ pub trait DepContext: Copy {
 f(self, dep_node)
 }
 }

 fn with_reduced_queries<T>(self, _: impl FnOnce() -> T) -> T;
}

pub trait Deps: DynSync {
Expand Down

25 changes: 25 additions & 0 deletions
tests/incremental/print-dep-node-cycle.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
//@ compile-flags: -Z query-dep-graph
//@ revisions: rpass1

// Exercises a debug-assertions-only query cycle that when printing a valtree const in
// a dep node's debug representation, we end up invoking a query that also has a valtree
// const in its dep node's debug representation, which leads to a cycle (and ICE, since
// deps are not tracked when printing dep nodes' debug representations).

#![feature(adt_const_params)]

use std::marker::ConstParamTy;

#[derive(Debug, ConstParamTy, PartialEq, Eq)]
enum Foo {
 A1,
}

#[inline(never)]
fn hello<const F: Foo>() {
 println!("{:#?}", F);
}

fn main() {
 hello::<{ Foo::A1 }>();
}

2 changes: 1 addition & 1 deletion
tests/ui/transmutability/structs/repr/transmute_infinitely_recursive_type.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ LL | struct ExplicitlyPadded(Box<ExplicitlyPadded>);
error[E0391]: cycle detected when computing layout of `should_pad_explicitly_packed_field::ExplicitlyPadded`
 |
 = note: ...which immediately requires computing layout of `should_pad_explicitly_packed_field::ExplicitlyPadded` again
 = note: cycle used when evaluating trait selection obligation `(): core::mem::transmutability::TransmuteFrom<should_pad_explicitly_packed_field::ExplicitlyPadded, core::mem::transmutability::Assume { alignment: false, lifetimes: false, safety: false, validity: false }>`
 = note: cycle used when evaluating trait selection obligation `(): core::mem::transmutability::TransmuteFrom<should_pad_explicitly_packed_field::ExplicitlyPadded, ValTree(Branch([Leaf(0x00), Leaf(0x00), Leaf(0x00), Leaf(0x00)]): core::mem::transmutability::Assume)>`
 = note: see https://rustc-dev-guide.rust-lang.org/overview.html#queries and https://rustc-dev-guide.rust-lang.org/query.html for more information

error: aborting due to 2 previous errors
Expand Down