Skip to content

Commit 6c4be68

Browse files
committed
Auto merge of #1379 - RalfJung:macos-fn-name, r=RalfJung
make sure macos function has 'macos' in its name also tiny README tweak
2 parents 351d46d + 580c119 commit 6c4be68

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ in your program, and cannot run all programs:
4848
has no access to most platform-specific APIs or FFI. A few APIs have been
4949
implemented (such as printing to stdout) but most have not: for example, Miri
5050
currently does not support SIMD or networking.
51-
* Miri currently does not check for data-races and most other concurrency
52-
related issues.
51+
* Miri currently does not check for data-races and most other concurrency-related
52+
issues.
5353

5454
[rust]: https://www.rust-lang.org/
5555
[mir]: https://github.com/rust-lang/rfcs/blob/master/text/1211-mir.md

src/shims/foreign_items/posix/macos.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
8383
let dtor = this.memory.get_fn(dtor)?.as_instance()?;
8484
let data = this.read_scalar(args[1])?.not_undef()?;
8585
let active_thread = this.get_active_thread()?;
86-
this.machine.tls.set_thread_dtor(active_thread, dtor, data)?;
86+
this.machine.tls.set_macos_thread_dtor(active_thread, dtor, data)?;
8787
}
8888

8989
// Querying system information

src/shims/tls.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ impl<'tcx> TlsData<'tcx> {
136136
/// implementation](https://github.com/opensource-apple/dyld/blob/195030646877261f0c8c7ad8b001f52d6a26f514/src/threadLocalVariables.c#L389):
137137
///
138138
/// // NOTE: this does not need locks because it only operates on current thread data
139-
pub fn set_thread_dtor(
139+
pub fn set_macos_thread_dtor(
140140
&mut self,
141141
thread: ThreadId,
142142
dtor: ty::Instance<'tcx>,

0 commit comments

Comments
 (0)