Skip to content

Commit c4e36dd

Browse files
committed
---
yaml --- r: 67509 b: refs/heads/master c: 1b018dd h: refs/heads/master i: 67507: e4cfecb v: v3
1 parent 9bf1c17 commit c4e36dd

File tree

3 files changed

+3
-12
lines changed

3 files changed

+3
-12
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 8ec70ae5de0e33ab62732c59b0b2b0620cb8dce9
2+
refs/heads/master: 1b018dd9bacab613c9627e2cc2c3491cb86042ee
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 18e3db7392d2d0697b7e27d6d986139960144d85
55
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9

trunk/src/librustc/middle/trans/base.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2258,15 +2258,13 @@ pub fn register_fn_full(ccx: @mut CrateContext,
22582258
node_type: ty::t)
22592259
-> ValueRef {
22602260
let llfty = type_of_fn_from_ty(ccx, node_type);
2261-
register_fn_fuller(ccx, sp, sym, node_id, node_type,
2262-
lib::llvm::CCallConv, llfty)
2261+
register_fn_fuller(ccx, sp, sym, node_id, lib::llvm::CCallConv, llfty)
22632262
}
22642263

22652264
pub fn register_fn_fuller(ccx: @mut CrateContext,
22662265
sp: span,
22672266
sym: ~str,
22682267
node_id: ast::NodeId,
2269-
_node_type: ty::t,
22702268
cc: lib::llvm::CallConv,
22712269
fn_ty: Type)
22722270
-> ValueRef {

trunk/src/librustc/middle/trans/foreign.rs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1154,17 +1154,10 @@ pub fn register_foreign_fn(ccx: @mut CrateContext,
11541154
-> ValueRef {
11551155
let _icx = push_ctxt("foreign::register_foreign_fn");
11561156

1157-
let t = ty::node_id_to_type(ccx.tcx, node_id);
11581157
let sym = Cell::new(sym);
11591158

11601159
let tys = shim_types(ccx, node_id);
11611160
do tys.fn_ty.decl_fn |fnty| {
1162-
register_fn_fuller(ccx,
1163-
sp,
1164-
sym.take(),
1165-
node_id,
1166-
t,
1167-
lib::llvm::CCallConv,
1168-
fnty)
1161+
register_fn_fuller(ccx, sp, sym.take(), node_id, lib::llvm::CCallConv, fnty)
11691162
}
11701163
}

0 commit comments

Comments
 (0)