Printing dominator subtrees for functions #51
Conversation
|
Ahh. I believe I know how to fix this. Shouldn't take too long, I don't think. |
subtrees of a specific function. Fixes issue rustwasm#15.
data-pup
force-pushed
the
display-dom-subtree
branch
from
d5713f1
to
2719a8d
Compare
opt/definitions.rs
Outdated
|
|
||
| /// The name of the function whose dominator subtree should be printed. | ||
| #[structopt(long = "function", default_value = "")] | ||
| func_name: String, |
There was a problem hiding this comment.
Can this be an optional positional argument, ie twiggy dominators input.wasm my_function? Unsure if that will be easy to do in structopt or not, but if we can do it without too much hassle, then I think that would be a little nicer ergonomics for users.
I'd also name this "subtree" rather than "func_name".
analyze/analyze.rs
Outdated
| @@ -358,8 +363,25 @@ pub fn dominators( | |||
| items.compute_dominator_tree(); | |||
| items.compute_retained_sizes(); | |||
|
|
|||
| /// Get the Id of the item with the given name. | |||
| fn get_item_id(items: &mut ir::Items, name: &str) -> Option<ir::Id> { | |||
There was a problem hiding this comment.
This seems like a generally useful utility method to add to ir::Items:
impl Items {
...
fn get_item_by_name(&self) -> Option<&Item> {
...
}
}Then, if we just need the id, we can map over the returned option like items.get_item_by_name("blah").map(|item| item.id()).
|
Oh! And after this merges, would you mind filing a follow up issue to allow the subtree name to be a regex, similar to #58 ? Thanks! |
|
Sure thing! I can take care of those fixes, shouldn't take too long. Once that's done and this has landed, I'll file that issue, wouldn't mind taking a swing at that too :D |
…block. Renamed the corresponding member variable to 'subtree'.
This commit aims to fix issue #15. Subtrees of the dominators tree can now be printed, if the
--functionflag is given to thedominatorsub-command. This also works when emitting JSON! This commit also adds a test case for JSON output of the overall dominators tree.It may be worth noting that if the function name is not found in the dominators tree, then the meta root is used, following the default behavior. I also was not quite sure what to call this flag, we can totally change the name of it if you would like :) Let me know if there are any issues you spot!