Skip to content

Commit 94129c4

Browse files
committed
dead argument removal part one.
1 parent db47cb5 commit 94129c4

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

src/comp/middle/trans.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7706,7 +7706,7 @@ fn find_main_fn(&@crate_ctxt cx) -> ValueRef {
77067706

77077707
fn trans_main_fn(@local_ctxt cx, ValueRef llcrate, ValueRef crate_map) {
77087708
auto T_main_args = [T_int(), T_int()];
7709-
auto T_rust_start_args = [T_int(), T_int(), T_int(), T_int(), T_int()];
7709+
auto T_rust_start_args = [T_int(), T_int(), T_int(), T_int()];
77107710

77117711
auto main_name;
77127712
if (str::eq(std::os::target_os(), "win32")) {
@@ -7718,7 +7718,7 @@ fn trans_main_fn(@local_ctxt cx, ValueRef llcrate, ValueRef crate_map) {
77187718
auto llmain =
77197719
decl_cdecl_fn(cx.ccx.llmod, main_name, T_fn(T_main_args, T_int()));
77207720

7721-
auto llrust_start = decl_cdecl_fn(cx.ccx.llmod, "rust_start",
7721+
auto llrust_start = decl_cdecl_fn(cx.ccx.llmod, "new_rust_start",
77227722
T_fn(T_rust_start_args, T_int()));
77237723

77247724
auto llargc = llvm::LLVMGetParam(llmain, 0u);
@@ -7737,8 +7737,7 @@ fn trans_main_fn(@local_ctxt cx, ValueRef llcrate, ValueRef crate_map) {
77377737
llvm::LLVMAppendBasicBlock(llmain, str::buf(""));
77387738
auto b = new_builder(llbb);
77397739

7740-
auto start_args = [p2i(llrust_main), p2i(llcrate), llargc, llargv,
7741-
p2i(crate_map)];
7740+
auto start_args = [p2i(llrust_main), llargc, llargv, p2i(crate_map)];
77427741

77437742
b.Ret(b.Call(llrust_start, start_args));
77447743
}

src/rt/rust.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@ command_line_args : public dom_owned<command_line_args>
7777
*/
7878

7979
extern "C" CDECL int
80-
rust_start(uintptr_t main_fn, rust_crate const *crate, int argc,
81-
char **argv, void* crate_map) {
80+
new_rust_start(uintptr_t main_fn, int argc, char **argv, void* crate_map) {
8281

8382
update_log_settings(crate_map, getenv("RUST_LOG"));
8483
rust_srv *srv = new rust_srv();
@@ -118,6 +117,12 @@ rust_start(uintptr_t main_fn, rust_crate const *crate, int argc,
118117
return ret;
119118
}
120119

120+
extern "C" CDECL int
121+
rust_start(uintptr_t main_fn, rust_crate const *crate, int argc,
122+
char **argv, void* crate_map) {
123+
return new_rust_start(main_fn, argc, argv, crate_map);
124+
}
125+
121126
//
122127
// Local Variables:
123128
// mode: C++

0 commit comments

Comments
 (0)