| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 #include "platform/heap/ThreadState.h" | 42 #include "platform/heap/ThreadState.h" |
| 43 #include "platform/tracing/TraceEvent.h" | 43 #include "platform/tracing/TraceEvent.h" |
| 44 #include "platform/tracing/web_memory_allocator_dump.h" | 44 #include "platform/tracing/web_memory_allocator_dump.h" |
| 45 #include "platform/tracing/web_process_memory_dump.h" | 45 #include "platform/tracing/web_process_memory_dump.h" |
| 46 #include "public/platform/Platform.h" | 46 #include "public/platform/Platform.h" |
| 47 #include "wtf/Assertions.h" | 47 #include "wtf/Assertions.h" |
| 48 #include "wtf/AutoReset.h" | 48 #include "wtf/AutoReset.h" |
| 49 #include "wtf/ContainerAnnotations.h" | 49 #include "wtf/ContainerAnnotations.h" |
| 50 #include "wtf/CurrentTime.h" | 50 #include "wtf/CurrentTime.h" |
| 51 #include "wtf/LeakAnnotations.h" | 51 #include "wtf/LeakAnnotations.h" |
| 52 #include "wtf/allocator/PageAllocator.h" | |
| 53 #include "wtf/allocator/Partitions.h" | 52 #include "wtf/allocator/Partitions.h" |
| 54 | 53 |
| 55 #ifdef ANNOTATE_CONTIGUOUS_CONTAINER | 54 #ifdef ANNOTATE_CONTIGUOUS_CONTAINER |
| 56 // FIXME: have ContainerAnnotations.h define an ENABLE_-style name instead. | 55 // FIXME: have ContainerAnnotations.h define an ENABLE_-style name instead. |
| 57 #define ENABLE_ASAN_CONTAINER_ANNOTATIONS 1 | 56 #define ENABLE_ASAN_CONTAINER_ANNOTATIONS 1 |
| 58 | 57 |
| 59 // When finalizing a non-inlined vector backing store/container, remove | 58 // When finalizing a non-inlined vector backing store/container, remove |
| 60 // its contiguous container annotation. Required as it will not be destructed | 59 // its contiguous container annotation. Required as it will not be destructed |
| 61 // from its Vector. | 60 // from its Vector. |
| 62 #define ASAN_RETIRE_CONTAINER_ANNOTATION(object, objectSize) \ | 61 #define ASAN_RETIRE_CONTAINER_ANNOTATION(object, objectSize) \ |
| (...skipping 1568 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1631 | 1630 |
| 1632 m_hasEntries = true; | 1631 m_hasEntries = true; |
| 1633 size_t index = hash(address); | 1632 size_t index = hash(address); |
| 1634 ASSERT(!(index & 1)); | 1633 ASSERT(!(index & 1)); |
| 1635 Address cachePage = roundToBlinkPageStart(address); | 1634 Address cachePage = roundToBlinkPageStart(address); |
| 1636 m_entries[index + 1] = m_entries[index]; | 1635 m_entries[index + 1] = m_entries[index]; |
| 1637 m_entries[index] = cachePage; | 1636 m_entries[index] = cachePage; |
| 1638 } | 1637 } |
| 1639 | 1638 |
| 1640 } // namespace blink | 1639 } // namespace blink |
| OLD | NEW |