[Fuchsia] Magenta -> Zircon

[mcgrathr]

Summary

Fuchsia's lowest API layer has been renamed from Magenta to Zircon.

[phosek]

LGTM

compiler-rt/trunk/CMakeLists.txt

else()
     append_list_if(COMPILER_RT_HAS_GCC_S_LIB gcc_s SANITIZER_COMMON_LINK_LIBS)
   endif()
 endif()
 
 append_list_if(COMPILER_RT_HAS_LIBC c SANITIZER_COMMON_LINK_LIBS)
 
 if("${CMAKE_SYSTEM_NAME}" STREQUAL "Fuchsia")
   list(APPEND SANITIZER_COMMON_LINK_FLAGS -Wl,-z,defs,-z,now,-z,relro)
-  list(APPEND SANITIZER_COMMON_LINK_LIBS magenta)
+  list(APPEND SANITIZER_COMMON_LINK_LIBS zircon)
 endif()
 
 # Warnings to turn off for all libraries, not just sanitizers.
 append_string_if(COMPILER_RT_HAS_WUNUSED_PARAMETER_FLAG -Wno-unused-parameter CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
 
 if (CMAKE_LINKER MATCHES "link.exe$")
   # Silence MSVC linker warnings caused by empty object files. The
   # sanitizer libraries intentionally use ifdefs that result in empty

compiler-rt/trunk/lib/asan/asan_fuchsia.cc

 #if SANITIZER_FUCHSIA
 
 #include "asan_interceptors.h"
 #include "asan_internal.h"
 #include "asan_stack.h"
 #include "asan_thread.h"
 
 #include <limits.h>
-#include <magenta/sanitizer.h>
-#include <magenta/syscalls.h>
-#include <magenta/threads.h>
+#include <zircon/sanitizer.h>
+#include <zircon/syscalls.h>
+#include <zircon/threads.h>
 
 namespace __asan {
 
 // The system already set up the shadow memory for us.
 // __sanitizer::GetMaxVirtualAddress has already been called by
 // AsanInitInternal->InitializeHighMemEnd (asan_rtl.cc).
 // Just do some additional sanity checks here.
 void InitializeShadowMemory() {
void AsanThread::SetThreadStackAndTls(const AsanThread::InitOptions *options) {
   CHECK_NE(options->stack_size, 0);
   stack_bottom_ = options->stack_bottom;
   stack_top_ = options->stack_bottom + options->stack_size;
 }
 
 // Called by __asan::AsanInitInternal (asan_rtl.c).
 AsanThread *CreateMainThread() {
   thrd_t self = thrd_current();
-  char name[MX_MAX_NAME_LEN];
+  char name[ZX_MAX_NAME_LEN];
   CHECK_NE(__sanitizer::MainThreadStackBase, 0);
   CHECK_GT(__sanitizer::MainThreadStackSize, 0);
   AsanThread *t = CreateAsanThread(
       nullptr, 0, reinterpret_cast<uptr>(self), true,
-      _mx_object_get_property(thrd_get_mx_handle(self), MX_PROP_NAME, name,
-                              sizeof(name)) == MX_OK
+      _zx_object_get_property(thrd_get_zx_handle(self), ZX_PROP_NAME, name,
+                              sizeof(name)) == ZX_OK
           ? name
           : nullptr,
       __sanitizer::MainThreadStackBase, __sanitizer::MainThreadStackSize);
   SetCurrentThread(t);
   return t;
 }
 
 // This is called before each thread creation is attempted.  So, in

 // with the pointer returned by BeforeThreadCreateHook (above).
 // All per-thread destructors have already been called.
 static void ThreadExitHook(void *hook, uptr os_id) {
   AsanThread::TSDDtor(per_thread);
 }
 
 }  // namespace __asan
 
-// These are declared (in extern "C") by <magenta/sanitizer.h>.
+// These are declared (in extern "C") by <zircon/sanitizer.h>.
 // The system runtime will call our definitions directly.
 
 void *__sanitizer_before_thread_create_hook(thrd_t thread, bool detached,
                                             const char *name, void *stack_base,
                                             size_t stack_size) {
   return __asan::BeforeThreadCreateHook(
       reinterpret_cast<uptr>(thread), detached, name,
       reinterpret_cast<uptr>(stack_base), stack_size);

compiler-rt/trunk/lib/interception/interception.h

# define DECLARE_WRAPPER(ret_type, func, ...) \
     extern "C" ret_type func(__VA_ARGS__) \
     __attribute__((weak, alias("__interceptor_" #func), visibility("default")));
 #endif
 
 #if defined(__Fuchsia__)
 // There is no general interception at all on Fuchsia.
 // Sanitizer runtimes just define functions directly to preempt them,
 // and have bespoke ways to access the underlying libc functions.
-# include <magenta/sanitizer.h>
+# include <zircon/sanitizer.h>
 # define INTERCEPTOR_ATTRIBUTE __attribute__((visibility("default")))
 # define REAL(x) __unsanitized_##x
 # define DECLARE_REAL(ret_type, func, ...)
 #elif !defined(__APPLE__)
 # define PTR_TO_REAL(x) real_##x
 # define REAL(x) __interception::PTR_TO_REAL(x)
 # define FUNC_TYPE(x) x##_f
 

compiler-rt/trunk/lib/sanitizer_common/sanitizer_coverage_fuchsia.cc

 // not prune the zeros, so the resulting file is always as large as it
 // would be to report 100% coverage.  Implicit tracing information about
 // the address ranges of DSOs allows offline tools to split the one big
 // blob into separate files that the 'sancov' tool can understand.
 //
 // Unlike the traditional implementation that uses an atexit hook to write
 // out data files at the end, the results on Fuchsia do not go into a file
 // per se.  The 'coverage_dir' option is ignored.  Instead, they are stored
-// directly into a shared memory object (a Magenta VMO).  At exit, that VMO
+// directly into a shared memory object (a Zircon VMO).  At exit, that VMO
 // is handed over to a system service that's responsible for getting the
 // data out to somewhere that it can be fed into the sancov tool (where and
 // how is not our problem).
 
 #include "sanitizer_platform.h"
 #if SANITIZER_FUCHSIA
 #include "sanitizer_atomic.h"
 #include "sanitizer_common.h"
 #include "sanitizer_internal_defs.h"
 
-#include <magenta/process.h>
-#include <magenta/sanitizer.h>
-#include <magenta/syscalls.h>
+#include <zircon/process.h>
+#include <zircon/sanitizer.h>
+#include <zircon/syscalls.h>
 
 using namespace __sanitizer;  // NOLINT
 
 namespace __sancov {
 namespace {
 
 // TODO(mcgrathr): Move the constant into a header shared with other impls.
 constexpr u64 Magic64 = 0xC0BFFFFFFFFFFF64ULL;
void TracePcGuard(u32 *guard, uptr pc) {
     atomic_uint32_t *guard_ptr = reinterpret_cast<atomic_uint32_t *>(guard);
     u32 idx = atomic_exchange(guard_ptr, 0, memory_order_relaxed);
     if (idx > 0) array_[idx] = pc;
   }
 
   void Dump() {
     BlockingMutexLock locked(&setup_lock_);
     if (array_) {
-      CHECK_NE(vmo_, MX_HANDLE_INVALID);
+      CHECK_NE(vmo_, ZX_HANDLE_INVALID);
 
       // Publish the VMO to the system, where it can be collected and
       // analyzed after this process exits.  This always consumes the VMO
       // handle.  Any failure is just logged and not indicated to us.
       __sanitizer_publish_data(kSancovSinkName, vmo_);
-      vmo_ = MX_HANDLE_INVALID;
+      vmo_ = ZX_HANDLE_INVALID;
 
       // This will route to __sanitizer_log_write, which will ensure that
       // information about shared libraries is written out.  This message
       // uses the `dumpfile` symbolizer markup element to highlight the
       // dump.  See the explanation for this in:
-      // https://fuchsia.googlesource.com/magenta/+/master/docs/symbolizer_markup.md
+      // https://fuchsia.googlesource.com/zircon/+/master/docs/symbolizer_markup.md
       Printf("SanitizerCoverage: {{{dumpfile:%s:%s}}} with up to %u PCs\n",
              kSancovSinkName, vmo_name_, next_index_ - 1);
     }
   }
 
  private:
   // We map in the largest possible view into the VMO: one word
   // for every possible 32-bit index value.  This avoids the need
   // to change the mapping when increasing the size of the VMO.
   // We can always spare the 32G of address space.
   static constexpr size_t MappingSize = sizeof(uptr) << 32;
 
   BlockingMutex setup_lock_;
   uptr *array_;
   u32 next_index_;
-  mx_handle_t vmo_;
-  char vmo_name_[MX_MAX_NAME_LEN];
+  zx_handle_t vmo_;
+  char vmo_name_[ZX_MAX_NAME_LEN];
 
   size_t DataSize() const { return next_index_ * sizeof(uintptr_t); }
 
   u32 Setup(u32 num_guards) {
     BlockingMutexLock locked(&setup_lock_);
     DCHECK(common_flags()->coverage);
 
     if (next_index_ == 0) {
-      CHECK_EQ(vmo_, MX_HANDLE_INVALID);
+      CHECK_EQ(vmo_, ZX_HANDLE_INVALID);
       CHECK_EQ(array_, nullptr);
 
       // The first sample goes at [1] to reserve [0] for the magic number.
       next_index_ = 1 + num_guards;
 
-      mx_status_t status = _mx_vmo_create(DataSize(), 0, &vmo_);
-      CHECK_EQ(status, MX_OK);
+      zx_status_t status = _zx_vmo_create(DataSize(), 0, &vmo_);
+      CHECK_EQ(status, ZX_OK);
 
       // Give the VMO a name including our process KOID so it's easy to spot.
       internal_snprintf(vmo_name_, sizeof(vmo_name_), "%s.%zu", kSancovSinkName,
                         internal_getpid());
-      _mx_object_set_property(vmo_, MX_PROP_NAME, vmo_name_,
+      _zx_object_set_property(vmo_, ZX_PROP_NAME, vmo_name_,
                               internal_strlen(vmo_name_));
 
       // Map the largest possible view we might need into the VMO.  Later
       // we might need to increase the VMO's size before we can use larger
       // indices, but we'll never move the mapping address so we don't have
       // any multi-thread synchronization issues with that.
       uintptr_t mapping;
       status =
-          _mx_vmar_map(_mx_vmar_root_self(), 0, vmo_, 0, MappingSize,
-                       MX_VM_FLAG_PERM_READ | MX_VM_FLAG_PERM_WRITE, &mapping);
-      CHECK_EQ(status, MX_OK);
+          _zx_vmar_map(_zx_vmar_root_self(), 0, vmo_, 0, MappingSize,
+                       ZX_VM_FLAG_PERM_READ | ZX_VM_FLAG_PERM_WRITE, &mapping);
+      CHECK_EQ(status, ZX_OK);
 
       // Hereafter other threads are free to start storing into
       // elements [1, next_index_) of the big array.
       array_ = reinterpret_cast<uptr *>(mapping);
 
       // Store the magic number.
       // Hereafter, the VMO serves as the contents of the '.sancov' file.
       array_[0] = Magic64;
 
       return 1;
     } else {
       // The VMO is already mapped in, but it's not big enough to use the
       // new indices.  So increase the size to cover the new maximum index.
 
-      CHECK_NE(vmo_, MX_HANDLE_INVALID);
+      CHECK_NE(vmo_, ZX_HANDLE_INVALID);
       CHECK_NE(array_, nullptr);
 
       uint32_t first_index = next_index_;
       next_index_ += num_guards;
 
-      mx_status_t status = _mx_vmo_set_size(vmo_, DataSize());
-      CHECK_EQ(status, MX_OK);
+      zx_status_t status = _zx_vmo_set_size(vmo_, DataSize());
+      CHECK_EQ(status, ZX_OK);
 
       return first_index;
     }
   }
 };
 
 static TracePcGuardController pc_guard_controller;
 

compiler-rt/trunk/lib/sanitizer_common/sanitizer_fuchsia.h

 #ifndef SANITIZER_FUCHSIA_H
 #define SANITIZER_FUCHSIA_H
 
 #include "sanitizer_platform.h"
 #if SANITIZER_FUCHSIA
 
 #include "sanitizer_common.h"
 
-#include <magenta/sanitizer.h>
+#include <zircon/sanitizer.h>
 
 namespace __sanitizer {
 
 extern uptr MainThreadStackBase, MainThreadStackSize;
 extern sanitizer_shadow_bounds_t ShadowBounds;
 
 }  // namespace __sanitizer
 
 #endif  // SANITIZER_FUCHSIA
 #endif  // SANITIZER_FUCHSIA_H

compiler-rt/trunk/lib/sanitizer_common/sanitizer_fuchsia.cc

 
 #include "sanitizer_common.h"
 #include "sanitizer_libc.h"
 #include "sanitizer_mutex.h"
 #include "sanitizer_procmaps.h"
 #include "sanitizer_stacktrace.h"
 
 #include <limits.h>
-#include <magenta/errors.h>
-#include <magenta/process.h>
-#include <magenta/syscalls.h>
 #include <pthread.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <unwind.h>
+#include <zircon/errors.h>
+#include <zircon/process.h>
+#include <zircon/syscalls.h>
 
 namespace __sanitizer {
 
-void NORETURN internal__exit(int exitcode) { _mx_process_exit(exitcode); }
+void NORETURN internal__exit(int exitcode) { _zx_process_exit(exitcode); }
 
 uptr internal_sched_yield() {
-  mx_status_t status = _mx_nanosleep(0);
-  CHECK_EQ(status, MX_OK);
+  zx_status_t status = _zx_nanosleep(0);
+  CHECK_EQ(status, ZX_OK);
   return 0;  // Why doesn't this return void?
 }
 
-static void internal_nanosleep(mx_time_t ns) {
-  mx_status_t status = _mx_nanosleep(_mx_deadline_after(ns));
-  CHECK_EQ(status, MX_OK);
+static void internal_nanosleep(zx_time_t ns) {
+  zx_status_t status = _zx_nanosleep(_zx_deadline_after(ns));
+  CHECK_EQ(status, ZX_OK);
 }
 
 unsigned int internal_sleep(unsigned int seconds) {
-  internal_nanosleep(MX_SEC(seconds));
+  internal_nanosleep(ZX_SEC(seconds));
   return 0;
 }
 
-u64 NanoTime() { return _mx_time_get(MX_CLOCK_UTC); }
+u64 NanoTime() { return _zx_time_get(ZX_CLOCK_UTC); }
 
 uptr internal_getpid() {
-  mx_info_handle_basic_t info;
-  mx_status_t status =
-      _mx_object_get_info(_mx_process_self(), MX_INFO_HANDLE_BASIC, &info,
+  zx_info_handle_basic_t info;
+  zx_status_t status =
+      _zx_object_get_info(_zx_process_self(), ZX_INFO_HANDLE_BASIC, &info,
                           sizeof(info), NULL, NULL);
-  CHECK_EQ(status, MX_OK);
+  CHECK_EQ(status, ZX_OK);
   uptr pid = static_cast<uptr>(info.koid);
   CHECK_EQ(pid, info.koid);
   return pid;
 }
 
 uptr GetThreadSelf() { return reinterpret_cast<uptr>(thrd_current()); }
 
 uptr GetTid() { return GetThreadSelf(); }
 
 void Abort() { abort(); }
 
 int Atexit(void (*function)(void)) { return atexit(function); }
 
 void SleepForSeconds(int seconds) { internal_sleep(seconds); }
 
-void SleepForMillis(int millis) { internal_nanosleep(MX_MSEC(millis)); }
+void SleepForMillis(int millis) { internal_nanosleep(ZX_MSEC(millis)); }
 
 void GetThreadStackTopAndBottom(bool, uptr *stack_top, uptr *stack_bottom) {
   pthread_attr_t attr;
   CHECK_EQ(pthread_getattr_np(pthread_self(), &attr), 0);
   void *base;
   size_t size;
   CHECK_EQ(pthread_attr_getstack(&attr, &base, &size), 0);
   CHECK_EQ(pthread_attr_destroy(&attr), 0);

 }
 
 void BlockingMutex::Lock() {
   CHECK_EQ(owner_, 0);
   atomic_uint32_t *m = reinterpret_cast<atomic_uint32_t *>(&opaque_storage_);
   if (atomic_exchange(m, MtxLocked, memory_order_acquire) == MtxUnlocked)
     return;
   while (atomic_exchange(m, MtxSleeping, memory_order_acquire) != MtxUnlocked) {
-    mx_status_t status = _mx_futex_wait(reinterpret_cast<mx_futex_t *>(m),
-                                        MtxSleeping, MX_TIME_INFINITE);
-    if (status != MX_ERR_BAD_STATE)  // Normal race.
-      CHECK_EQ(status, MX_OK);
+    zx_status_t status = _zx_futex_wait(reinterpret_cast<zx_futex_t *>(m),
+                                        MtxSleeping, ZX_TIME_INFINITE);
+    if (status != ZX_ERR_BAD_STATE)  // Normal race.
+      CHECK_EQ(status, ZX_OK);
   }
 }
 
 void BlockingMutex::Unlock() {
   atomic_uint32_t *m = reinterpret_cast<atomic_uint32_t *>(&opaque_storage_);
   u32 v = atomic_exchange(m, MtxUnlocked, memory_order_release);
   CHECK_NE(v, MtxUnlocked);
   if (v == MtxSleeping) {
-    mx_status_t status = _mx_futex_wake(reinterpret_cast<mx_futex_t *>(m), 1);
-    CHECK_EQ(status, MX_OK);
+    zx_status_t status = _zx_futex_wake(reinterpret_cast<zx_futex_t *>(m), 1);
+    CHECK_EQ(status, ZX_OK);
   }
 }
 
 void BlockingMutex::CheckLocked() {
   atomic_uint32_t *m = reinterpret_cast<atomic_uint32_t *>(&opaque_storage_);
   CHECK_NE(MtxUnlocked, atomic_load(m, memory_order_relaxed));
 }
 
 uptr GetPageSize() { return PAGE_SIZE; }
 
 uptr GetMmapGranularity() { return PAGE_SIZE; }
 
 sanitizer_shadow_bounds_t ShadowBounds;
 
 uptr GetMaxVirtualAddress() {
   ShadowBounds = __sanitizer_shadow_bounds();
   return ShadowBounds.memory_limit - 1;
 }
 
 static void *DoAnonymousMmapOrDie(uptr size, const char *mem_type,
                                   bool raw_report, bool die_for_nomem) {
   size = RoundUpTo(size, PAGE_SIZE);
 
-  mx_handle_t vmo;
-  mx_status_t status = _mx_vmo_create(size, 0, &vmo);
-  if (status != MX_OK) {
-    if (status != MX_ERR_NO_MEMORY || die_for_nomem)
-      ReportMmapFailureAndDie(size, mem_type, "mx_vmo_create", status,
+  zx_handle_t vmo;
+  zx_status_t status = _zx_vmo_create(size, 0, &vmo);
+  if (status != ZX_OK) {
+    if (status != ZX_ERR_NO_MEMORY || die_for_nomem)
+      ReportMmapFailureAndDie(size, mem_type, "zx_vmo_create", status,
                               raw_report);
     return nullptr;
   }
-  _mx_object_set_property(vmo, MX_PROP_NAME, mem_type,
+  _zx_object_set_property(vmo, ZX_PROP_NAME, mem_type,
                           internal_strlen(mem_type));
 
   // TODO(mcgrathr): Maybe allocate a VMAR for all sanitizer heap and use that?
   uintptr_t addr;
-  status = _mx_vmar_map(_mx_vmar_root_self(), 0, vmo, 0, size,
-                        MX_VM_FLAG_PERM_READ | MX_VM_FLAG_PERM_WRITE, &addr);
-  _mx_handle_close(vmo);
-
-  if (status != MX_OK) {
-    if (status != MX_ERR_NO_MEMORY || die_for_nomem)
-      ReportMmapFailureAndDie(size, mem_type, "mx_vmar_map", status,
+  status = _zx_vmar_map(_zx_vmar_root_self(), 0, vmo, 0, size,
+                        ZX_VM_FLAG_PERM_READ | ZX_VM_FLAG_PERM_WRITE, &addr);
+  _zx_handle_close(vmo);
+
+  if (status != ZX_OK) {
+    if (status != ZX_ERR_NO_MEMORY || die_for_nomem)
+      ReportMmapFailureAndDie(size, mem_type, "zx_vmar_map", status,
                               raw_report);
     return nullptr;
   }
 
   IncreaseTotalMmap(size);
 
   return reinterpret_cast<void *>(addr);
 }
void *MmapOrDieOnFatalError(uptr size, const char *mem_type) {
   return DoAnonymousMmapOrDie(size, mem_type, false, false);
 }
 
 // MmapNoAccess and MmapFixedOrDie are used only by sanitizer_allocator.
 // Instead of doing exactly what they say, we make MmapNoAccess actually
 // just allocate a VMAR to reserve the address space.  Then MmapFixedOrDie
 // uses that VMAR instead of the root.
 
-mx_handle_t allocator_vmar = MX_HANDLE_INVALID;
+zx_handle_t allocator_vmar = ZX_HANDLE_INVALID;
 uintptr_t allocator_vmar_base;
 size_t allocator_vmar_size;
 
 void *MmapNoAccess(uptr size) {
   size = RoundUpTo(size, PAGE_SIZE);
-  CHECK_EQ(allocator_vmar, MX_HANDLE_INVALID);
+  CHECK_EQ(allocator_vmar, ZX_HANDLE_INVALID);
   uintptr_t base;
-  mx_status_t status =
-      _mx_vmar_allocate(_mx_vmar_root_self(), 0, size,
-                        MX_VM_FLAG_CAN_MAP_READ | MX_VM_FLAG_CAN_MAP_WRITE |
-                            MX_VM_FLAG_CAN_MAP_SPECIFIC,
+  zx_status_t status =
+      _zx_vmar_allocate(_zx_vmar_root_self(), 0, size,
+                        ZX_VM_FLAG_CAN_MAP_READ | ZX_VM_FLAG_CAN_MAP_WRITE |
+                            ZX_VM_FLAG_CAN_MAP_SPECIFIC,
                         &allocator_vmar, &base);
-  if (status != MX_OK)
+  if (status != ZX_OK)
     ReportMmapFailureAndDie(size, "sanitizer allocator address space",
-                            "mx_vmar_allocate", status);
+                            "zx_vmar_allocate", status);
 
   allocator_vmar_base = base;
   allocator_vmar_size = size;
   return reinterpret_cast<void *>(base);
 }
 
 constexpr const char kAllocatorVmoName[] = "sanitizer_allocator";
 
 static void *DoMmapFixedOrDie(uptr fixed_addr, uptr size, bool die_for_nomem) {
   size = RoundUpTo(size, PAGE_SIZE);
 
-  mx_handle_t vmo;
-  mx_status_t status = _mx_vmo_create(size, 0, &vmo);
-  if (status != MX_OK) {
-    if (status != MX_ERR_NO_MEMORY || die_for_nomem)
-      ReportMmapFailureAndDie(size, kAllocatorVmoName, "mx_vmo_create", status);
+  zx_handle_t vmo;
+  zx_status_t status = _zx_vmo_create(size, 0, &vmo);
+  if (status != ZX_OK) {
+    if (status != ZX_ERR_NO_MEMORY || die_for_nomem)
+      ReportMmapFailureAndDie(size, kAllocatorVmoName, "zx_vmo_create", status);
     return nullptr;
   }
-  _mx_object_set_property(vmo, MX_PROP_NAME, kAllocatorVmoName,
+  _zx_object_set_property(vmo, ZX_PROP_NAME, kAllocatorVmoName,
                           sizeof(kAllocatorVmoName) - 1);
 
   DCHECK_GE(fixed_addr, allocator_vmar_base);
   uintptr_t offset = fixed_addr - allocator_vmar_base;
   DCHECK_LE(size, allocator_vmar_size);
   DCHECK_GE(allocator_vmar_size - offset, size);
 
   uintptr_t addr;
-  status = _mx_vmar_map(
+  status = _zx_vmar_map(
       allocator_vmar, offset, vmo, 0, size,
-      MX_VM_FLAG_PERM_READ | MX_VM_FLAG_PERM_WRITE | MX_VM_FLAG_SPECIFIC,
+      ZX_VM_FLAG_PERM_READ | ZX_VM_FLAG_PERM_WRITE | ZX_VM_FLAG_SPECIFIC,
       &addr);
-  _mx_handle_close(vmo);
-  if (status != MX_OK) {
-    if (status != MX_ERR_NO_MEMORY || die_for_nomem)
-      ReportMmapFailureAndDie(size, kAllocatorVmoName, "mx_vmar_map", status);
+  _zx_handle_close(vmo);
+  if (status != ZX_OK) {
+    if (status != ZX_ERR_NO_MEMORY || die_for_nomem)
+      ReportMmapFailureAndDie(size, kAllocatorVmoName, "zx_vmar_map", status);
     return nullptr;
   }
 
   IncreaseTotalMmap(size);
 
   return reinterpret_cast<void *>(addr);
 }
 

 }
 
 void *MmapAlignedOrDieOnFatalError(uptr size, uptr alignment,
                                    const char *mem_type) {
   CHECK_GE(size, PAGE_SIZE);
   CHECK(IsPowerOfTwo(size));
   CHECK(IsPowerOfTwo(alignment));
 
-  mx_handle_t vmo;
-  mx_status_t status = _mx_vmo_create(size, 0, &vmo);
-  if (status != MX_OK) {
-    if (status != MX_ERR_NO_MEMORY)
-      ReportMmapFailureAndDie(size, mem_type, "mx_vmo_create", status, false);
+  zx_handle_t vmo;
+  zx_status_t status = _zx_vmo_create(size, 0, &vmo);
+  if (status != ZX_OK) {
+    if (status != ZX_ERR_NO_MEMORY)
+      ReportMmapFailureAndDie(size, mem_type, "zx_vmo_create", status, false);
     return nullptr;
   }
-  _mx_object_set_property(vmo, MX_PROP_NAME, mem_type,
+  _zx_object_set_property(vmo, ZX_PROP_NAME, mem_type,
                           internal_strlen(mem_type));
 
   // TODO(mcgrathr): Maybe allocate a VMAR for all sanitizer heap and use that?
 
   // Map a larger size to get a chunk of address space big enough that
   // it surely contains an aligned region of the requested size.  Then
   // overwrite the aligned middle portion with a mapping from the
   // beginning of the VMO, and unmap the excess before and after.
   size_t map_size = size + alignment;
   uintptr_t addr;
-  status = _mx_vmar_map(_mx_vmar_root_self(), 0, vmo, 0, map_size,
-                        MX_VM_FLAG_PERM_READ | MX_VM_FLAG_PERM_WRITE, &addr);
-  if (status == MX_OK) {
+  status = _zx_vmar_map(_zx_vmar_root_self(), 0, vmo, 0, map_size,
+                        ZX_VM_FLAG_PERM_READ | ZX_VM_FLAG_PERM_WRITE, &addr);
+  if (status == ZX_OK) {
     uintptr_t map_addr = addr;
     uintptr_t map_end = map_addr + map_size;
     addr = RoundUpTo(map_addr, alignment);
     uintptr_t end = addr + size;
     if (addr != map_addr) {
-      mx_info_vmar_t info;
-      status = _mx_object_get_info(_mx_vmar_root_self(), MX_INFO_VMAR, &info,
+      zx_info_vmar_t info;
+      status = _zx_object_get_info(_zx_vmar_root_self(), ZX_INFO_VMAR, &info,
                                    sizeof(info), NULL, NULL);
-      if (status == MX_OK) {
+      if (status == ZX_OK) {
         uintptr_t new_addr;
         status =
-            _mx_vmar_map(_mx_vmar_root_self(), addr - info.base, vmo, 0, size,
-                         MX_VM_FLAG_PERM_READ | MX_VM_FLAG_PERM_WRITE |
-                             MX_VM_FLAG_SPECIFIC_OVERWRITE,
+            _zx_vmar_map(_zx_vmar_root_self(), addr - info.base, vmo, 0, size,
+                         ZX_VM_FLAG_PERM_READ | ZX_VM_FLAG_PERM_WRITE |
+                             ZX_VM_FLAG_SPECIFIC_OVERWRITE,
                          &new_addr);
-        if (status == MX_OK) CHECK_EQ(new_addr, addr);
+        if (status == ZX_OK) CHECK_EQ(new_addr, addr);
       }
     }
-    if (status == MX_OK && addr != map_addr)
-      status = _mx_vmar_unmap(_mx_vmar_root_self(), map_addr, addr - map_addr);
-    if (status == MX_OK && end != map_end)
-      status = _mx_vmar_unmap(_mx_vmar_root_self(), end, map_end - end);
+    if (status == ZX_OK && addr != map_addr)
+      status = _zx_vmar_unmap(_zx_vmar_root_self(), map_addr, addr - map_addr);
+    if (status == ZX_OK && end != map_end)
+      status = _zx_vmar_unmap(_zx_vmar_root_self(), end, map_end - end);
   }
-  _mx_handle_close(vmo);
+  _zx_handle_close(vmo);
 
-  if (status != MX_OK) {
-    if (status != MX_ERR_NO_MEMORY)
-      ReportMmapFailureAndDie(size, mem_type, "mx_vmar_map", status, false);
+  if (status != ZX_OK) {
+    if (status != ZX_ERR_NO_MEMORY)
+      ReportMmapFailureAndDie(size, mem_type, "zx_vmar_map", status, false);
     return nullptr;
   }
 
   IncreaseTotalMmap(size);
 
   return reinterpret_cast<void *>(addr);
 }
 
 void UnmapOrDie(void *addr, uptr size) {
   if (!addr || !size) return;
   size = RoundUpTo(size, PAGE_SIZE);
 
-  mx_status_t status = _mx_vmar_unmap(_mx_vmar_root_self(),
+  zx_status_t status = _zx_vmar_unmap(_zx_vmar_root_self(),
                                       reinterpret_cast<uintptr_t>(addr), size);
-  if (status != MX_OK) {
+  if (status != ZX_OK) {
     Report("ERROR: %s failed to deallocate 0x%zx (%zd) bytes at address %p\n",
            SanitizerToolName, size, size, addr);
     CHECK("unable to unmap" && 0);
   }
 
   DecreaseTotalMmap(size);
 }
 
 // This is used on the shadow mapping, which cannot be changed.
-// Magenta doesn't have anything like MADV_DONTNEED.
+// Zircon doesn't have anything like MADV_DONTNEED.
 void ReleaseMemoryPagesToOS(uptr beg, uptr end) {}
 
 void DumpProcessMap() {
   UNIMPLEMENTED();  // TODO(mcgrathr): write it
 }
 
 bool IsAccessibleMemoryRange(uptr beg, uptr size) {
   // TODO(mcgrathr): Figure out a better way.
-  mx_handle_t vmo;
-  mx_status_t status = _mx_vmo_create(size, 0, &vmo);
-  if (status == MX_OK) {
+  zx_handle_t vmo;
+  zx_status_t status = _zx_vmo_create(size, 0, &vmo);
+  if (status == ZX_OK) {
     while (size > 0) {
       size_t wrote;
-      status = _mx_vmo_write(vmo, reinterpret_cast<const void *>(beg), 0, size,
+      status = _zx_vmo_write(vmo, reinterpret_cast<const void *>(beg), 0, size,
                              &wrote);
-      if (status != MX_OK) break;
+      if (status != ZX_OK) break;
       CHECK_GT(wrote, 0);
       CHECK_LE(wrote, size);
       beg += wrote;
       size -= wrote;
     }
-    _mx_handle_close(vmo);
+    _zx_handle_close(vmo);
   }
-  return status == MX_OK;
+  return status == ZX_OK;
 }
 
 // FIXME implement on this platform.
 void GetMemoryProfile(fill_profile_f cb, uptr *stats, uptr stats_size) {}
 
 bool ReadFileToBuffer(const char *file_name, char **buff, uptr *buff_size,
                       uptr *read_len, uptr max_len, error_t *errno_p) {
-  mx_handle_t vmo;
-  mx_status_t status = __sanitizer_get_configuration(file_name, &vmo);
-  if (status == MX_OK) {
+  zx_handle_t vmo;
+  zx_status_t status = __sanitizer_get_configuration(file_name, &vmo);
+  if (status == ZX_OK) {
     uint64_t vmo_size;
-    status = _mx_vmo_get_size(vmo, &vmo_size);
-    if (status == MX_OK) {
+    status = _zx_vmo_get_size(vmo, &vmo_size);
+    if (status == ZX_OK) {
       if (vmo_size < max_len) max_len = vmo_size;
       size_t map_size = RoundUpTo(max_len, PAGE_SIZE);
       uintptr_t addr;
-      status = _mx_vmar_map(_mx_vmar_root_self(), 0, vmo, 0, map_size,
-                            MX_VM_FLAG_PERM_READ, &addr);
-      if (status == MX_OK) {
+      status = _zx_vmar_map(_zx_vmar_root_self(), 0, vmo, 0, map_size,
+                            ZX_VM_FLAG_PERM_READ, &addr);
+      if (status == ZX_OK) {
         *buff = reinterpret_cast<char *>(addr);
         *buff_size = map_size;
         *read_len = max_len;
       }
     }
-    _mx_handle_close(vmo);
+    _zx_handle_close(vmo);
   }
-  if (status != MX_OK && errno_p) *errno_p = status;
-  return status == MX_OK;
+  if (status != ZX_OK && errno_p) *errno_p = status;
+  return status == ZX_OK;
 }
 
 void RawWrite(const char *buffer) {
   __sanitizer_log_write(buffer, internal_strlen(buffer));
 }
 
 void CatastrophicErrorWrite(const char *buffer, uptr length) {
   __sanitizer_log_write(buffer, length);

 
 uptr ReadLongProcessName(/*out*/ char *buf, uptr buf_len) {
   return ReadBinaryName(buf, buf_len);
 }
 
 uptr MainThreadStackBase, MainThreadStackSize;
 
 bool GetRandom(void *buffer, uptr length, bool blocking) {
-  CHECK_LE(length, MX_CPRNG_DRAW_MAX_LEN);
+  CHECK_LE(length, ZX_CPRNG_DRAW_MAX_LEN);
   size_t size;
-  CHECK_EQ(_mx_cprng_draw(buffer, length, &size), MX_OK);
+  CHECK_EQ(_zx_cprng_draw(buffer, length, &size), ZX_OK);
   CHECK_EQ(size, length);
   return true;
 }
 
 }  // namespace __sanitizer
 
 using namespace __sanitizer;  // NOLINT
 

compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_fuchsia.cc

 namespace __sanitizer {
 
 // For Fuchsia we don't do any actual symbolization per se.
 // Instead, we emit text containing raw addresses and raw linkage
 // symbol names, embedded in Fuchsia's symbolization markup format.
 // Fuchsia's logging infrastructure emits enough information about
 // process memory layout that a post-processing filter can do the
 // symbolization and pretty-print the markup.  See the spec at:
-// https://fuchsia.googlesource.com/magenta/+/master/docs/symbolizer_markup.md
+// https://fuchsia.googlesource.com/zircon/+/master/docs/symbolizer_markup.md
 
 // This is used by UBSan for type names, and by ASan for global variable names.
 constexpr const char *kFormatDemangle = "{{{symbol:%s}}}";
 constexpr uptr kFormatDemangleMax = 1024;  // Arbitrary.
 
 // Function name or equivalent from PC location.
 constexpr const char *kFormatFunction = "{{{pc:%p}}}";
-constexpr uptr kFormatFunctionMax = 64; // More than big enough for 64-bit hex.
+constexpr uptr kFormatFunctionMax = 64;  // More than big enough for 64-bit hex.
 
 // Global variable name or equivalent from data memory address.
 constexpr const char *kFormatData = "{{{data:%p}}}";
 
 // One frame in a backtrace (printed on a line by itself).
 constexpr const char *kFormatFrame = "{{{bt:%u:%p}}}";
 
 // This is used by UBSan for type names, and by ASan for global variable names.

 // We don't support the stack_trace_format flag at all.
 void RenderFrame(InternalScopedString *buffer, const char *format, int frame_no,
                  const AddressInfo &info, bool vs_style,
                  const char *strip_path_prefix, const char *strip_func_prefix) {
   buffer->append(kFormatFrame, frame_no, info.address);
 }
 
 Symbolizer *Symbolizer::PlatformInit() {
-  return new(symbolizer_allocator_) Symbolizer({});
+  return new (symbolizer_allocator_) Symbolizer({});
 }
 
-void Symbolizer::LateInitialize() {
-  Symbolizer::GetOrInit();
-}
+void Symbolizer::LateInitialize() { Symbolizer::GetOrInit(); }
 
 }  // namespace __sanitizer
 
 #endif  // SANITIZER_FUCHSIA