---

yaml
---
r: 2769
b: refs/heads/master
c: f9946c9
h: refs/heads/master
i:
  2767: 0578bfd
v: v3

Author: cixtor

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40a3923fca653236120191b8851b42b457e0ed7d
+refs/heads/master: f9946c9748fe47d21cb24fb06d9235b1440c5d7a

trunk/src/etc/x86.supp

@@ -34,7 +34,6 @@
    fun:_ZN16rust_crate_cache3libC1EP8rust_domPKc
    fun:_ZN16rust_crate_cache7get_libEmPKc
    fun:_ZL11fetch_c_symP9rust_taskPK10rust_cratemmPKcS5_
-   fun:upcall_require_c_sym
 }
 
 {
@@ -49,7 +48,6 @@
    fun:_ZN16rust_crate_cache3libC1EP8rust_domPKc
    fun:_ZN16rust_crate_cache7get_libEmPKc
    fun:_ZL11fetch_c_symP9rust_taskPK10rust_cratemmPKcS5_
-   fun:upcall_require_c_sym
 }
 
 {
@@ -64,7 +62,6 @@
    fun:_ZN16rust_crate_cache3libC1EP8rust_domPKc
    fun:_ZN16rust_crate_cache7get_libEmPKc
    fun:_ZL11fetch_c_symP9rust_taskPK10rust_cratemmPKcS5_
-   fun:upcall_require_c_sym
 }
 
 {
@@ -80,7 +77,6 @@
    fun:_ZN16rust_crate_cache3libC1EP8rust_domPKc
    fun:_ZN16rust_crate_cache7get_libEmPKc
    fun:_ZL11fetch_c_symP9rust_taskPK10rust_cratemmPKcS5_
-   fun:upcall_require_c_sym
 }
 
 {
@@ -97,7 +93,6 @@
    fun:_ZN16rust_crate_cache3libC1EP8rust_domPKc
    fun:_ZN16rust_crate_cache7get_libEmPKc
    fun:_ZL11fetch_c_symP9rust_taskPK10rust_cratemmPKcS5_
-   fun:upcall_require_c_sym
 }
 
 {
@@ -114,6 +109,5 @@
    fun:_ZN16rust_crate_cache3libC1EP8rust_domPKc
    fun:_ZN16rust_crate_cache7get_libEmPKc
    fun:_ZL11fetch_c_symP9rust_taskPK10rust_cratemmPKcS5_
-   fun:upcall_require_c_sym
 }
 

trunk/src/rt/rust_upcall.cpp

@@ -436,48 +436,6 @@ upcall_vec_grow(rust_task *task,
     return v;
 }
 
-static rust_crate_cache::c_sym *
-fetch_c_sym(rust_task *task,
-            rust_crate const *curr_crate,
-            size_t lib_num,
-            size_t c_sym_num,
-            char const *library,
-            char const *symbol) {
-    rust_crate_cache *cache = task->get_crate_cache(curr_crate);
-    rust_crate_cache::lib *l = cache->get_lib(lib_num, library);
-    return cache->get_c_sym(c_sym_num, l, symbol);
-}
-
-extern "C" CDECL uintptr_t
-upcall_require_c_sym(rust_task *task,
-                     rust_crate const *curr_crate,
-                     size_t lib_num, // # of lib
-                     size_t c_sym_num, // # of C sym
-                     char const *library,
-                     char const *symbol) {
-    LOG_UPCALL_ENTRY(task);
-
-    LOG(task, cache, "upcall require c sym: lib #%" PRIdPTR
-        " = %s, c_sym #%" PRIdPTR
-        " = %s"
-        ", curr_crate = 0x%" PRIxPTR, lib_num, library, c_sym_num,
-        symbol, curr_crate);
-
-    rust_crate_cache::c_sym *c = fetch_c_sym(task, curr_crate, lib_num,
-                                             c_sym_num, library, symbol);
-
-    uintptr_t addr = c->get_val();
-    if (addr) {
-        LOG(task, cache,
-                  "found-or-cached addr: 0x%" PRIxPTR, addr);
-    } else {
-        LOG_ERR(task, cache, "failed to resolve symbol %s in %s",
-                symbol, library);
-        task->fail(6);
-    }
-    return addr;
-}
-
 extern "C" CDECL type_desc *
 upcall_get_type_desc(rust_task *task,
                      rust_crate const *curr_crate,

trunk/src/rt/rustrt.def.in

@@ -61,7 +61,6 @@ upcall_new_task
 upcall_new_thread
 upcall_new_vec
 upcall_recv
-upcall_require_c_sym
 upcall_send
 upcall_sleep
 upcall_start_task