Skip to content

Commit 21f5087

Browse files
authored
Merge pull request #4 from JornVernee/Missing_ResourceMarks
Add missing resource marks before parsing descriptors
2 parents 7675bbc + d1c1309 commit 21f5087

File tree

4 files changed

+4
-0
lines changed

4 files changed

+4
-0
lines changed

src/hotspot/cpu/aarch64/universalNativeInvoker_aarch64.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ class ProgrammableInvokerGenerator : public StubCodeGenerator {
150150
};
151151

152152
jlong ProgrammableInvoker::generate_adapter(jobject jabi, jobject jlayout) {
153+
ResourceMark rm;
153154
const ABIDescriptor abi = ForeignGlobals::parseABIDescriptor(jabi);
154155
const BufferLayout layout = ForeignGlobals::parseBufferLayout(jlayout);
155156

src/hotspot/cpu/aarch64/universalUpcallHandler_aarch64.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ static address generate_upcall_stub(jobject rec, const ABIDescriptor& abi,
185185
}
186186

187187
jlong ProgrammableUpcallHandler::generate_upcall_stub(jobject rec, jobject jabi, jobject jlayout) {
188+
ResourceMark rm;
188189
const ABIDescriptor abi = ForeignGlobals::parseABIDescriptor(jabi);
189190
const BufferLayout layout = ForeignGlobals::parseBufferLayout(jlayout);
190191

src/hotspot/cpu/x86/universalNativeInvoker_x86.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ class ProgrammableInvokerGenerator : public StubCodeGenerator {
188188
};
189189

190190
jlong ProgrammableInvoker::generate_adapter(jobject jabi, jobject jlayout) {
191+
ResourceMark rm;
191192
const ABIDescriptor abi = ForeignGlobals::parseABIDescriptor(jabi);
192193
const BufferLayout layout = ForeignGlobals::parseBufferLayout(jlayout);
193194

src/hotspot/cpu/x86/universalUpcallHandler_x86.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ static address generate_upcall_stub(jobject rec, const ABIDescriptor& abi, const
237237
}
238238

239239
jlong ProgrammableUpcallHandler::generate_upcall_stub(jobject rec, jobject jabi, jobject jlayout) {
240+
ResourceMark rm;
240241
const ABIDescriptor abi = ForeignGlobals::parseABIDescriptor(jabi);
241242
const BufferLayout layout = ForeignGlobals::parseBufferLayout(jlayout);
242243

0 commit comments

Comments
 (0)