diff --git a/BUILD.gn b/BUILD.gn index bd49573ba0..adb84fed25 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -485,8 +485,7 @@ if (build_with_chromium && v8_current_cpu == "arm64" && # Enable the virtual memory cage on 64-bit Chromium builds. if (build_with_chromium && v8_enable_pointer_compression_shared_cage) { - # The cage is incompatible with lsan. - v8_enable_virtual_memory_cage = !is_lsan + v8_enable_virtual_memory_cage = true } assert(!v8_disable_write_barriers || v8_enable_single_generation, @@ -521,9 +520,6 @@ assert( !v8_enable_virtual_memory_cage || v8_enable_pointer_compression_shared_cage, "V8 VirtualMemoryCage requires the shared pointer compression cage") -assert(!v8_enable_virtual_memory_cage || !is_lsan, - "V8 VirtualMemoryCage is currently incompatible with Leak Sanitizer") - assert( !v8_enable_pointer_compression_shared_cage || v8_enable_pointer_compression, "Can't share a pointer compression cage if pointers aren't compressed") diff --git a/src/utils/allocation.cc b/src/utils/allocation.cc index a50b955266..ebaacb47ea 100644 --- a/src/utils/allocation.cc +++ b/src/utils/allocation.cc @@ -54,7 +54,6 @@ class PageAllocatorInitializer { page_allocator_ = default_page_allocator.get(); } #if defined(LEAK_SANITIZER) - static_assert(!V8_VIRTUAL_MEMORY_CAGE_BOOL, "Not currently supported"); static base::LeakyObject lsan_allocator( page_allocator_); page_allocator_ = lsan_allocator.get();