Auto merge of #1379 - RalfJung:macos-fn-name, r=RalfJung

make sure macos function has 'macos' in its name

also tiny README tweak
This commit is contained in:
bors 2020-04-30 17:40:40 +00:00
commit 6c4be68b79
3 changed files with 4 additions and 4 deletions

View File

@ -48,8 +48,8 @@ in your program, and cannot run all programs:
has no access to most platform-specific APIs or FFI. A few APIs have been
implemented (such as printing to stdout) but most have not: for example, Miri
currently does not support SIMD or networking.
* Miri currently does not check for data-races and most other concurrency
related issues.
* Miri currently does not check for data-races and most other concurrency-related
issues.
[rust]: https://www.rust-lang.org/
[mir]: https://github.com/rust-lang/rfcs/blob/master/text/1211-mir.md

View File

@ -83,7 +83,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
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

View File

@ -136,7 +136,7 @@ impl<'tcx> TlsData<'tcx> {
/// 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>,