From ba670d69701acd444019c296a0699f7549439e33 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Thu, 30 Apr 2020 19:38:17 +0200 Subject: [PATCH] make sure macos function has 'macos' in its name --- src/shims/foreign_items/posix/macos.rs | 2 +- src/shims/tls.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shims/foreign_items/posix/macos.rs b/src/shims/foreign_items/posix/macos.rs index 200b88f29c8..0e3019ce33a 100644 --- a/src/shims/foreign_items/posix/macos.rs +++ b/src/shims/foreign_items/posix/macos.rs @@ -83,7 +83,7 @@ fn emulate_foreign_item_by_name( let dtor = this.memory.get_fn(dtor)?.as_instance()?; let data = this.read_scalar(args[1])?.not_undef()?; let active_thread = this.get_active_thread()?; - this.machine.tls.set_thread_dtor(active_thread, dtor, data)?; + this.machine.tls.set_macos_thread_dtor(active_thread, dtor, data)?; } // Querying system information diff --git a/src/shims/tls.rs b/src/shims/tls.rs index f78b46ec3e7..1ef4728faf0 100644 --- a/src/shims/tls.rs +++ b/src/shims/tls.rs @@ -136,7 +136,7 @@ pub fn store_tls( /// implementation](https://github.com/opensource-apple/dyld/blob/195030646877261f0c8c7ad8b001f52d6a26f514/src/threadLocalVariables.c#L389): /// /// // NOTE: this does not need locks because it only operates on current thread data - pub fn set_thread_dtor( + pub fn set_macos_thread_dtor( &mut self, thread: ThreadId, dtor: ty::Instance<'tcx>, -- 2.44.0