Skip to content

Commit 4359705

Browse files
committed
---
yaml --- r: 150510 b: refs/heads/try2 c: 8f385fc h: refs/heads/master v: v3
1 parent a32bc52 commit 4359705

File tree

2 files changed

+1
-43
lines changed

2 files changed

+1
-43
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: a2290ccbc567fade350ea9a10d83f03527dea647
8+
refs/heads/try2: 8f385fc2e01c14cea8323e3dba86518bed306a9a
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/trans/callee.rs

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -512,48 +512,6 @@ pub fn trans_lang_call<'a>(
512512
dest)
513513
}
514514

515-
pub fn trans_lang_call_with_type_params<'a>(
516-
bcx: &'a Block<'a>,
517-
did: ast::DefId,
518-
args: &[ValueRef],
519-
type_params: &[ty::t],
520-
dest: expr::Dest)
521-
-> &'a Block<'a> {
522-
let fty;
523-
if did.krate == ast::LOCAL_CRATE {
524-
fty = ty::node_id_to_type(bcx.tcx(), did.node);
525-
} else {
526-
fty = csearch::get_type(bcx.tcx(), did).ty;
527-
}
528-
529-
return callee::trans_call_inner(
530-
bcx,
531-
None,
532-
fty,
533-
|bcx, _| {
534-
let callee =
535-
trans_fn_ref_with_vtables_to_callee(bcx, did, 0,
536-
type_params,
537-
None);
538-
539-
let new_llval;
540-
match callee.data {
541-
Fn(llfn) => {
542-
let substituted = ty::subst_tps(callee.bcx.tcx(),
543-
type_params,
544-
None,
545-
fty);
546-
let llfnty = type_of::type_of(callee.bcx.ccx(),
547-
substituted);
548-
new_llval = PointerCast(callee.bcx, llfn, llfnty);
549-
}
550-
_ => fail!()
551-
}
552-
Callee { bcx: callee.bcx, data: Fn(new_llval) }
553-
},
554-
ArgVals(args), Some(dest)).bcx;
555-
}
556-
557515
pub fn trans_call_inner<'a>(
558516
bcx: &'a Block<'a>,
559517
call_info: Option<NodeInfo>,

0 commit comments

Comments
 (0)