Skip to content
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

Mark live codes in struct/enum for dead-code pass #10994

Closed
wants to merge 2 commits into from
Closed

Mark live codes in struct/enum for dead-code pass #10994

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
c810ee8
AST Visitor now walks enum discriminant expression
ktt3ja Dec 16, 2013
fb4a1d8
Mark live codes in struct/enum for dead-code pass
ktt3ja Dec 16, 2013
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
2 changes: 2 additions & 0 deletions src/librustc/middle/dead.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ impl MarkSymbolVisitor {
match item.node {
ast::item_fn(..)
| ast::item_ty(..)
| ast::item_enum(..)
| ast::item_struct(..)
| ast::item_static(..) => {
visit::walk_item(self, item, ());
}
Expand Down
4 changes: 4 additions & 0 deletions src/libsyntax/visit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,10 @@ pub fn walk_variant<E:Clone, V:Visitor<E>>(visitor:&mut V,
env.clone())
}
}
match variant.node.disr_expr {
Some(expr) => visitor.visit_expr(expr, env),
None => ()
}
}

pub fn skip_ty<E, V:Visitor<E>>(_: &mut V, _: &Ty, _: E) {
Expand Down
8 changes: 8 additions & 0 deletions src/test/compile-fail/lint-dead-code-1.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ static priv_static: int = 0; //~ ERROR: code is never used
static used_static: int = 0;
pub static used_static2: int = used_static;
static USED_STATIC: int = 0;
static STATIC_USED_IN_ENUM_DISCRIMINANT: uint = 10;

pub type typ = ~UsedStruct4;
pub struct PubStruct();
Expand All @@ -41,8 +42,15 @@ struct SemiUsedStruct;
impl SemiUsedStruct {
fn la_la_la() {}
}
struct StructUsedAsField;
struct StructUsedInEnum;
pub struct PubStruct2 {
struct_used_as_field: *StructUsedAsField
}

pub enum pub_enum { foo1, bar1 }
pub enum pub_enum2 { a(~StructUsedInEnum) }
pub enum pub_enum3 { Foo = STATIC_USED_IN_ENUM_DISCRIMINANT }
enum priv_enum { foo2, bar2 } //~ ERROR: code is never used
enum used_enum { foo3, bar3 }

Expand Down