Skip to content

Commit 19508c7

Browse files
committed
Make trans pass responsible for pulling in inlined functions
This makes the logic for finding the inlinable items much easier -- they are simply pulled in lazily when encountered.
1 parent 9b88219 commit 19508c7

File tree

6 files changed

+75
-209
lines changed

6 files changed

+75
-209
lines changed

src/rustc/driver/driver.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import syntax::parse::{parser};
66
import syntax::{ast, codemap};
77
import front::attr;
88
import middle::{trans, resolve, freevars, kind, ty, typeck, fn_usage,
9-
last_use, lint, inline};
9+
last_use, lint};
1010
import syntax::print::{pp, pprust};
1111
import util::{ppaux, filesearch};
1212
import back::link;
@@ -177,16 +177,11 @@ fn compile_upto(sess: session, cfg: ast::crate_cfg,
177177
last_uses: last_uses, impl_map: impl_map,
178178
method_map: method_map, dict_map: dict_map};
179179

180-
let ienbld = sess.opts.inline;
181-
let inline_map =
182-
time(time_passes, "inline",
183-
bind inline::instantiate_inlines(ienbld, ty_cx, maps, crate));
184-
185180
let (llmod, link_meta) =
186181
time(time_passes, "translation",
187182
bind trans::base::trans_crate(
188183
sess, crate, ty_cx, outputs.obj_filename,
189-
exp_map, maps, inline_map));
184+
exp_map, maps));
190185
time(time_passes, "LLVM passes",
191186
bind link::write::run_passes(sess, llmod, outputs.obj_filename));
192187

src/rustc/middle/inline.rs

Lines changed: 0 additions & 100 deletions
This file was deleted.

0 commit comments

Comments
 (0)