Mercurial > hg > icedtea8-forest > hotspot
changeset 10811:95c0425aa09f
8237512, PR3797: AArch64: aarch64TestHook leaks a BufferBlob
Reviewed-by: adinn, aph
| author | ngasson |
|---|---|
| date | Tue, 12 May 2020 06:08:05 -0400 |
| parents | 5c7085df7f80 |
| children | 57a4cd59376f |
| files | src/cpu/aarch64/vm/aarch64Test.cpp src/cpu/aarch64/vm/assembler_aarch64.cpp src/cpu/aarch64/vm/icache_aarch64.cpp |
| diffstat | 3 files changed, 12 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cpu/aarch64/vm/aarch64Test.cpp Tue May 05 11:50:40 2020 -0400 +++ b/src/cpu/aarch64/vm/aarch64Test.cpp Tue May 12 06:08:05 2020 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Red Hat Inc. + * Copyright (c) 2014, 2020, Red Hat Inc. * All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -29,10 +29,12 @@ extern "C" void entry(CodeBuffer*); +#ifdef ASSERT void aarch64TestHook() { BufferBlob* b = BufferBlob::create("aarch64Test", 500000); CodeBuffer code(b); - MacroAssembler _masm(&code); entry(&code); + BufferBlob::free(b); } +#endif
--- a/src/cpu/aarch64/vm/assembler_aarch64.cpp Tue May 05 11:50:40 2020 -0400 +++ b/src/cpu/aarch64/vm/assembler_aarch64.cpp Tue May 12 06:08:05 2020 -0400 @@ -1,6 +1,6 @@ /* - * Copyright (c) 2013, Red Hat Inc. - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights + * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2020 Red Hat Inc. All rights reserved. * reserved. DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE * HEADER. * @@ -72,6 +72,8 @@ static float unpack(unsigned value); +#ifdef ASSERT + void entry(CodeBuffer *cb) { // { @@ -88,7 +90,6 @@ // Smoke test for assembler -#ifdef ASSERT // BEGIN Generated code -- do not edit // Generated by aarch64-asmtest.py Label back, forth; @@ -1194,8 +1195,9 @@ #endif // PRODUCT +} + #endif // ASSERT -} #undef __
--- a/src/cpu/aarch64/vm/icache_aarch64.cpp Tue May 05 11:50:40 2020 -0400 +++ b/src/cpu/aarch64/vm/icache_aarch64.cpp Tue May 12 06:08:05 2020 -0400 @@ -25,7 +25,6 @@ */ #include "precompiled.hpp" -#include "asm/macroAssembler.hpp" #include "runtime/icache.hpp" extern void aarch64TestHook(); @@ -37,5 +36,7 @@ } void ICache::initialize() { +#ifdef ASSERT aarch64TestHook(); +#endif }