OpenJDK / amber / amber
changeset 54776:da5dc7e654aa
8218566: NMT: missing memory tag for assert poison page
Reviewed-by: shade, stuefe
| author | zgu |
|---|---|
| date | Wed, 06 Feb 2019 13:30:27 -0500 |
| parents | 6268e0cdb008 |
| children | 929f0c7e019b |
| files | src/hotspot/share/utilities/debug.cpp |
| diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/share/utilities/debug.cpp Wed Feb 06 16:25:58 2019 +0000 +++ b/src/hotspot/share/utilities/debug.cpp Wed Feb 06 13:30:27 2019 -0500 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -34,6 +34,7 @@ #include "gc/shared/collectedHeap.hpp" #include "interpreter/bytecodeHistogram.hpp" #include "interpreter/interpreter.hpp" +#include "memory/allocation.hpp" #include "memory/resourceArea.hpp" #include "memory/universe.hpp" #include "oops/oop.inline.hpp" @@ -51,6 +52,7 @@ #include "runtime/vframe.hpp" #include "runtime/vm_version.hpp" #include "services/heapDumper.hpp" +#include "services/memTracker.hpp" #include "utilities/defaultStream.hpp" #include "utilities/events.hpp" #include "utilities/formatBuffer.hpp" @@ -721,6 +723,7 @@ void initialize_assert_poison() { char* page = os::reserve_memory(os::vm_page_size()); if (page) { + MemTracker::record_virtual_memory_type(page, mtInternal); if (os::commit_memory(page, os::vm_page_size(), false) && os::protect_memory(page, os::vm_page_size(), os::MEM_PROT_NONE)) { g_assert_poison = page;