From 97a99a2240ee91acbae09a2ab257e2f0b14eb0ba Mon Sep 17 00:00:00 2001 From: Aleksey Shipilev Date: Thu, 25 May 2023 17:33:03 +0200 Subject: [PATCH 1/2] Backport 64b05ccbed7879dd38a49453a6098bfe9729ee76 --- src/hotspot/share/memory/allocation.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hotspot/share/memory/allocation.cpp b/src/hotspot/share/memory/allocation.cpp index 241213d0b2c..89be338dadc 100644 --- a/src/hotspot/share/memory/allocation.cpp +++ b/src/hotspot/share/memory/allocation.cpp @@ -49,7 +49,7 @@ char* AllocateHeap(size_t size, char* AllocateHeap(size_t size, MEMFLAGS flags, AllocFailType alloc_failmode /* = AllocFailStrategy::EXIT_OOM*/) { - return AllocateHeap(size, flags, CALLER_PC); + return AllocateHeap(size, flags, CALLER_PC, alloc_failmode); } char* ReallocateHeap(char *old, From 263ed82fe16b961cc108d64c37791b75dc68fccf Mon Sep 17 00:00:00 2001 From: Aleksey Shipilev Date: Thu, 25 May 2023 17:41:52 +0200 Subject: [PATCH 2/2] Backport b0d2b0a3553cbb2db23d543b98ab1401b3dbfa91 --- src/hotspot/share/prims/jni.cpp | 2 +- src/hotspot/share/utilities/nativeCallStack.hpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/hotspot/share/prims/jni.cpp b/src/hotspot/share/prims/jni.cpp index e42206050ba..68a29f8bc78 100644 --- a/src/hotspot/share/prims/jni.cpp +++ b/src/hotspot/share/prims/jni.cpp @@ -2234,7 +2234,7 @@ JNI_ENTRY(const char*, jni_GetStringUTFChars(JNIEnv *env, jstring string, jboole if (s_value != NULL) { size_t length = java_lang_String::utf8_length(java_string, s_value); /* JNI Specification states return NULL on OOM */ - result = AllocateHeap(length + 1, mtInternal, 0, AllocFailStrategy::RETURN_NULL); + result = AllocateHeap(length + 1, mtInternal, AllocFailStrategy::RETURN_NULL); if (result != NULL) { java_lang_String::as_utf8_string(java_string, s_value, result, (int) length + 1); if (isCopy != NULL) { diff --git a/src/hotspot/share/utilities/nativeCallStack.hpp b/src/hotspot/share/utilities/nativeCallStack.hpp index 33ce0164d84..8387a1ce259 100644 --- a/src/hotspot/share/utilities/nativeCallStack.hpp +++ b/src/hotspot/share/utilities/nativeCallStack.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2022, 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 @@ -64,7 +64,7 @@ class NativeCallStack : public StackObj { memset(_stack, 0, sizeof(_stack)); } - NativeCallStack(int toSkip); + explicit NativeCallStack(int toSkip); NativeCallStack(address* pc, int frameCount); static inline const NativeCallStack& empty_stack() { return _empty_stack; }