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.

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

Introduce graph abstraction and use for region inference, CFG #7688

Merged
merged 5 commits into from
Jul 12, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
523 changes: 523 additions & 0 deletions src/librustc/middle/cfg/construct.rs

Large diffs are not rendered by default.

61 changes: 61 additions & 0 deletions src/librustc/middle/cfg/mod.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

/*!

Module that constructs a control-flow graph representing an item.
Uses `Graph` as the underlying representation.

*/

use middle::graph;
use middle::ty;
use middle::typeck;
use std::hashmap::HashMap;
use syntax::ast;
use syntax::opt_vec::OptVec;

mod construct;

pub struct CFG {
exit_map: HashMap<ast::node_id, CFGIndex>,
graph: CFGGraph,
entry: CFGIndex,
exit: CFGIndex,
}

pub struct CFGNodeData {
id: ast::node_id
}

pub struct CFGEdgeData {
exiting_scopes: OptVec<ast::node_id>
}

pub type CFGIndex = graph::NodeIndex;

pub type CFGGraph = graph::Graph<CFGNodeData, CFGEdgeData>;

pub type CFGNode = graph::Node<CFGNodeData>;

pub type CFGEdge = graph::Edge<CFGEdgeData>;

pub struct CFGIndices {
entry: CFGIndex,
exit: CFGIndex,
}

impl CFG {
pub fn new(tcx: ty::ctxt,
method_map: typeck::method_map,
blk: &ast::blk) -> CFG {
construct::construct(tcx, method_map, blk)
}
}
Loading