---

yaml
---
r: 2768
b: refs/heads/master
c: 40a3923
h: refs/heads/master
v: v3

Author: cixtor

[refs]

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

trunk/src/rt/rust_upcall.cpp

@@ -448,48 +448,6 @@ fetch_c_sym(rust_task *task,
     return cache->get_c_sym(c_sym_num, l, symbol);
 }
 
-extern "C" CDECL uintptr_t
-upcall_require_rust_sym(rust_task *task,
-                        rust_crate const *curr_crate,
-                        size_t lib_num, // # of lib
-                        size_t c_sym_num, // # of C sym "rust_crate" in lib
-                        size_t rust_sym_num, // # of rust sym
-                        char const *library,
-                        char const **path) {
-    LOG_UPCALL_ENTRY(task);
-    rust_dom *dom = task->dom;
-
-    LOG(task, cache, "upcall require rust sym: lib #%" PRIdPTR
-        " = %s, c_sym #%" PRIdPTR
-        ", rust_sym #%" PRIdPTR
-        ", curr_crate = 0x%" PRIxPTR, lib_num, library, c_sym_num,
-        rust_sym_num, curr_crate);
-    for (char const **c = crate_rel(curr_crate, path); *c; ++c) {
-        LOG(task, upcall, " + %s", crate_rel(curr_crate, *c));
-    }
-
-    LOG(task, cache, "require C symbol 'rust_crate' from lib #%" PRIdPTR,
-        lib_num);
-    rust_crate_cache::c_sym *c =
-            fetch_c_sym(task, curr_crate, lib_num, c_sym_num, library,
-                        "rust_crate");
-
-    LOG(task, cache, "require rust symbol inside crate");
-    rust_crate_cache::rust_sym *s = task->cache->get_rust_sym(rust_sym_num,
-                                                              dom,
-                                                              curr_crate, c,
-                                                              path);
-
-    uintptr_t addr = s->get_val();
-    if (addr) {
-        LOG(task, cache, "found-or-cached addr: 0x%" PRIxPTR, addr);
-    } else {
-        LOG_ERR(task, cache, "failed to resolve symbol");
-        task->fail(7);
-    }
-    return addr;
-}
-
 extern "C" CDECL uintptr_t
 upcall_require_c_sym(rust_task *task,
                      rust_crate const *curr_crate,

trunk/src/rt/rustrt.def.in

@@ -62,7 +62,6 @@ upcall_new_thread
 upcall_new_vec
 upcall_recv
 upcall_require_c_sym
-upcall_require_rust_sym
 upcall_send
 upcall_sleep
 upcall_start_task