Skip to content

fix for ICE issue #25180 #25209

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

Closed
wants to merge 8 commits into from
Closed

fix for ICE issue #25180 #25209

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
96229e8
fixed ICE issue #25180
llogiq May 8, 2015
29daa29
formatting correction
llogiq May 8, 2015
1434715
crossed the i-s and dotted the t-s ;-) Also added a run-pass test and…
llogiq May 8, 2015
ca5c694
Pulled walk_fn() into Var mode, extended test
llogiq May 10, 2015
6e19cfa
more tests
llogiq May 10, 2015
a18ce4d
fixed errors in test code
llogiq May 10, 2015
4eec41a
Removed println! from test
llogiq May 12, 2015
3715898
added feature declaration
llogiq May 12, 2015
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
6 changes: 5 additions & 1 deletion src/librustc/middle/check_const.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,9 +251,13 @@ impl<'a, 'tcx, 'v> Visitor<'v> for CheckCrateVisitor<'a, 'tcx> {
b: &'v ast::Block,
s: Span,
fn_id: ast::NodeId) {
assert!(self.mode == Mode::Var);
let (old_mode, old_qualif) = (self.mode, self.qualif);
self.mode = Mode::Var;
self.qualif = ConstQualif::empty();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't have to copy with_mode, you can just call it (and replace self in the two original statements with v, or whatever you choose for the name of the closure argument).

self.with_euv(Some(fn_id), |euv| euv.walk_fn(fd, b));
visit::walk_fn(self, fk, fd, b, s);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

walk_fn has to be inside the with_mode call, too.

self.mode = old_mode;
self.qualif = old_qualif;
}

fn visit_pat(&mut self, p: &ast::Pat) {
Expand Down