Chromium Code Reviews| Index: runtime/vm/malloc_hooks_tcmalloc.cc |
| diff --git a/runtime/vm/malloc_hooks_tcmalloc.cc b/runtime/vm/malloc_hooks_tcmalloc.cc |
| index 56185b0e77eae16a01555a1cc3b71649eb24cbfb..e4a5b86044bd4a18984611e1b095cebef2feae48 100644 |
| --- a/runtime/vm/malloc_hooks_tcmalloc.cc |
| +++ b/runtime/vm/malloc_hooks_tcmalloc.cc |
| @@ -4,7 +4,7 @@ |
| #include "platform/globals.h" |
| -#if defined(DART_USE_TCMALLOC) && !defined(PRODUCT) && !defined(TARGET_ARCH_DBC) |
| +#if defined(DART_USE_TCMALLOC) && !defined(PRODUCT) |
| #include "vm/malloc_hooks.h" |
| @@ -138,7 +138,8 @@ class AllocationInfo { |
| MallocHooksState::stack_trace_collection_enabled()) { |
| sample_ = Profiler::SampleNativeAllocation(kSkipCount, address, |
| allocation_size); |
| - ASSERT(sample_->native_allocation_address() == address_); |
| + ASSERT((sample_ == NULL) || |
|
rmacnak
2017/04/20 17:47:36
Profiler can fail if we can't get a good fp or sta
|
| + (sample_->native_allocation_address() == address_)); |
| } |
| } |
| @@ -443,5 +444,4 @@ void MallocHooksState::RecordFreeHook(const void* ptr) { |
| } // namespace dart |
| -#endif // defined(DART_USE_TCMALLOC) && !defined(PRODUCT) && |
| - // !defined(TARGET_ARCH_DBC) && !defined(HOST_OS_FUCHSIA) |
| +#endif // defined(DART_USE_TCMALLOC) && !defined(PRODUCT) |