From ba7c8f18d4d18e519649386fb558480af7e4f033 Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Wed, 10 Aug 2011 18:09:52 -0700 Subject: [PATCH] rustc: Remove unused "trace" upcalls --- src/comp/back/upcall.rs | 4 ---- src/comp/middle/trans.rs | 13 ------------- src/rt/rust_upcall.cpp | 12 ------------ src/rt/rustrt.def.in | 2 -- 4 files changed, 31 deletions(-) diff --git a/src/comp/back/upcall.rs b/src/comp/back/upcall.rs index fc84dd4fefee..622d8d5c0d70 100644 --- a/src/comp/back/upcall.rs +++ b/src/comp/back/upcall.rs @@ -26,8 +26,6 @@ import lib::llvm::llvm::TypeRef; type upcalls = {grow_task: ValueRef, - trace_word: ValueRef, - trace_str: ValueRef, new_port: ValueRef, del_port: ValueRef, new_chan: ValueRef, @@ -85,8 +83,6 @@ fn declare_upcalls(tn: type_names, tydesc_type: TypeRef, let empty_vec: [TypeRef] = ~[]; ret @{grow_task: dv("grow_task", ~[T_size_t()]), - trace_word: dv("trace_word", ~[T_int()]), - trace_str: dv("trace_str", ~[T_ptr(T_i8())]), new_port: d("new_port", ~[T_size_t()], T_opaque_port_ptr()), del_port: dv("del_port", ~[T_opaque_port_ptr()]), new_chan: diff --git a/src/comp/middle/trans.rs b/src/comp/middle/trans.rs index be8c151d4895..e84e98101c43 100644 --- a/src/comp/middle/trans.rs +++ b/src/comp/middle/trans.rs @@ -6761,19 +6761,6 @@ fn declare_intrinsics(llmod: ModuleRef) -> hashmap[str, ValueRef] { ret intrinsics; } -fn trace_str(cx: &@block_ctxt, s: str) { - cx.build.Call(bcx_ccx(cx).upcalls.trace_str, - ~[cx.fcx.lltaskptr, C_cstr(bcx_ccx(cx), s)]); -} - -fn trace_word(cx: &@block_ctxt, v: ValueRef) { - cx.build.Call(bcx_ccx(cx).upcalls.trace_word, ~[cx.fcx.lltaskptr, v]); -} - -fn trace_ptr(cx: &@block_ctxt, v: ValueRef) { - trace_word(cx, cx.build.PtrToInt(v, T_int())); -} - fn trap(bcx: &@block_ctxt) { let v: [ValueRef] = ~[]; alt bcx_ccx(bcx).intrinsics.find("llvm.trap") { diff --git a/src/rt/rust_upcall.cpp b/src/rt/rust_upcall.cpp index cd8d9b96e2e0..99d888cc3b1f 100644 --- a/src/rt/rust_upcall.cpp +++ b/src/rt/rust_upcall.cpp @@ -70,18 +70,6 @@ upcall_log_istr(rust_task *task, uint32_t level, rust_ivec *str) { task->sched->log(task, level, "rust: %s", buf); } -extern "C" CDECL void -upcall_trace_word(rust_task *task, uintptr_t i) { - LOG_UPCALL_ENTRY(task); - task->sched->log(task, 2, "trace: 0x%" PRIxPTR "", i, i, (char) i); -} - -extern "C" CDECL void -upcall_trace_str(rust_task *task, char const *c) { - LOG_UPCALL_ENTRY(task); - task->sched->log(task, 2, "trace: %s", c); -} - extern "C" CDECL rust_port* new_port(rust_task *task, size_t unit_sz); extern "C" CDECL rust_port* diff --git a/src/rt/rustrt.def.in b/src/rt/rustrt.def.in index 87c86c129b88..cbd6b86348ed 100644 --- a/src/rt/rustrt.def.in +++ b/src/rt/rustrt.def.in @@ -113,8 +113,6 @@ upcall_sleep upcall_start_task upcall_take_task upcall_take_chan -upcall_trace_str -upcall_trace_word upcall_vec_append upcall_yield vec_alloc