diff options
| author | Andreas Gampe <agampe@google.com> | 2015-04-07 02:53:04 +0000 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2015-04-07 02:53:04 +0000 |
| commit | 48cc32c05efaaba5d97e1b83a9f9d8172a8ca352 (patch) | |
| tree | 26cf799de71e10af1b3c2419b4d16244d793e73c /runtime/entrypoints | |
| parent | 79dda4251d7e3a7888e326bc7a3f069d6190d194 (diff) | |
| download | art-48cc32c05efaaba5d97e1b83a9f9d8172a8ca352.zip art-48cc32c05efaaba5d97e1b83a9f9d8172a8ca352.tar.gz art-48cc32c05efaaba5d97e1b83a9f9d8172a8ca352.tar.bz2 | |
Revert "ART: Fix noreturn for Mac"
missing-noreturn was turned off for Mac for all the
other similar warnings. Restore the cleaner header
file.
This reverts commit 79dda4251d7e3a7888e326bc7a3f069d6190d194.
Change-Id: Ia25a47533ff7848ad96e0d76e7f0ea768a48f946
Diffstat (limited to 'runtime/entrypoints')
| -rw-r--r-- | runtime/entrypoints/quick/quick_alloc_entrypoints.cc | 20 | ||||
| -rw-r--r-- | runtime/entrypoints/quick/quick_alloc_entrypoints.h | 4 |
2 files changed, 7 insertions, 17 deletions
diff --git a/runtime/entrypoints/quick/quick_alloc_entrypoints.cc b/runtime/entrypoints/quick/quick_alloc_entrypoints.cc index 49350ca..c049e3d 100644 --- a/runtime/entrypoints/quick/quick_alloc_entrypoints.cc +++ b/runtime/entrypoints/quick/quick_alloc_entrypoints.cc @@ -230,13 +230,8 @@ void SetQuickAllocEntryPointsInstrumented(bool instrumented) { entry_points_instrumented = instrumented; } -#if defined(__APPLE__) && defined(__LP64__) -void ResetQuickAllocEntryPoints(QuickEntryPoints* qpoints ATTRIBUTE_UNUSED) { - UNIMPLEMENTED(FATAL); - UNREACHABLE(); -} -#else void ResetQuickAllocEntryPoints(QuickEntryPoints* qpoints) { +#if !defined(__APPLE__) || !defined(__LP64__) switch (entry_points_allocator) { case gc::kAllocatorTypeDlMalloc: { SetQuickAllocEntryPoints_dlmalloc(qpoints, entry_points_instrumented); @@ -266,15 +261,14 @@ void ResetQuickAllocEntryPoints(QuickEntryPoints* qpoints) { SetQuickAllocEntryPoints_region_tlab(qpoints, entry_points_instrumented); return; } - - case gc::kAllocatorTypeLOS: - case gc::kAllocatorTypeNonMoving: - UNIMPLEMENTED(FATAL) << "Unexpected allocator type " << entry_points_allocator; - UNREACHABLE(); + default: + break; } - LOG(FATAL); +#else + UNUSED(qpoints); +#endif + UNIMPLEMENTED(FATAL); UNREACHABLE(); } -#endif } // namespace art diff --git a/runtime/entrypoints/quick/quick_alloc_entrypoints.h b/runtime/entrypoints/quick/quick_alloc_entrypoints.h index a99dc8a..ec0aef5 100644 --- a/runtime/entrypoints/quick/quick_alloc_entrypoints.h +++ b/runtime/entrypoints/quick/quick_alloc_entrypoints.h @@ -17,16 +17,12 @@ #ifndef ART_RUNTIME_ENTRYPOINTS_QUICK_QUICK_ALLOC_ENTRYPOINTS_H_ #define ART_RUNTIME_ENTRYPOINTS_QUICK_QUICK_ALLOC_ENTRYPOINTS_H_ -#include "base/macros.h" #include "base/mutex.h" #include "gc/allocator_type.h" #include "quick_entrypoints.h" namespace art { -#if defined(__APPLE__) && defined(__LP64__) -NO_RETURN -#endif void ResetQuickAllocEntryPoints(QuickEntryPoints* qpoints); // Runtime shutdown lock is necessary to prevent races in thread initialization. When the thread is |