-
Notifications
You must be signed in to change notification settings - Fork 1.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix debuginfotest gate #4121
Merged
Merged
Fix debuginfotest gate #4121
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
494344a
Fix line numbers in debuginfotest
zakkak 72da9cb
Don't create JNINativeCallWrapperMethods for JNICallTrampolineMethods
zakkak 348db87
Refactor: Don't generate 0-sized arrays for methods with no arguments
zakkak 92620bf
fixup! Don't create JNINativeCallWrapperMethods for JNICallTrampoline…
zakkak 5b56df0
fixup! Don't create JNINativeCallWrapperMethods for JNICallTrampoline…
zakkak 9005517
fixup! Don't create JNINativeCallWrapperMethods for JNICallTrampoline…
zakkak 76eb95f
fixup! Don't create JNINativeCallWrapperMethods for JNICallTrampoline…
zakkak File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
93 changes: 93 additions & 0 deletions
93
substratevm/src/com.oracle.svm.jni/src/com/oracle/svm/jni/JNIJavaCallTrampolines.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| /* | ||
| * Copyright (c) 2017, 2021, 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 | ||
| * under the terms of the GNU General Public License version 2 only, as | ||
| * published by the Free Software Foundation. Oracle designates this | ||
| * particular file as subject to the "Classpath" exception as provided | ||
| * by Oracle in the LICENSE file that accompanied this code. | ||
| * | ||
| * This code is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
| * version 2 for more details (a copy is included in the LICENSE file that | ||
| * accompanied this code). | ||
| * | ||
| * You should have received a copy of the GNU General Public License version | ||
| * 2 along with this work; if not, write to the Free Software Foundation, | ||
| * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| * | ||
| * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||
| * or visit www.oracle.com if you need additional information or have any | ||
| * questions. | ||
| */ | ||
| package com.oracle.svm.jni; | ||
|
|
||
| import com.oracle.svm.core.util.VMError; | ||
| import com.oracle.svm.jni.hosted.JNIJavaCallWrapperMethod; | ||
| import com.oracle.svm.jni.hosted.JNIJavaCallWrapperMethod.CallVariant; | ||
|
|
||
| import jdk.vm.ci.meta.ConstantPool; | ||
| import jdk.vm.ci.meta.MetaAccessProvider; | ||
|
|
||
| /** | ||
| * Holder class for generated {@link JNIJavaCallWrapperMethod} code. | ||
| */ | ||
| public final class JNIJavaCallTrampolines { | ||
| public static ConstantPool getConstantPool(MetaAccessProvider metaAccess) { | ||
| // Each generated call wrapper needs an actual constant pool, so we provide our | ||
| // private constructor's | ||
| return metaAccess.lookupJavaType(JNIJavaCallWrappers.class).getDeclaredConstructors()[0].getConstantPool(); | ||
| } | ||
|
|
||
| private JNIJavaCallTrampolines() { | ||
| } | ||
|
|
||
| public static String getTrampolineName(CallVariant variant, boolean nonVirtual) { | ||
| StringBuilder name = new StringBuilder(48); | ||
| if (variant == CallVariant.VARARGS) { | ||
| name.append("varargs"); | ||
| } else if (variant == CallVariant.ARRAY) { | ||
| name.append("array"); | ||
| } else if (variant == CallVariant.VA_LIST) { | ||
| name.append("valist"); | ||
| } else { | ||
| throw VMError.shouldNotReachHere(); | ||
| } | ||
| if (nonVirtual) { | ||
| name.append("Nonvirtual"); | ||
| } | ||
| name.append("JavaCallTrampoline"); | ||
| return name.toString(); | ||
| } | ||
|
|
||
| public static boolean isNonVirtual(String trampolineName) { | ||
| return trampolineName.endsWith("NonvirtualJavaCallTrampoline"); | ||
| } | ||
|
|
||
| public static CallVariant getVariant(String trampolineName) { | ||
| if (trampolineName.startsWith("varargs")) { | ||
| return CallVariant.VARARGS; | ||
| } | ||
| if (trampolineName.startsWith("array")) { | ||
| return CallVariant.ARRAY; | ||
| } | ||
| if (trampolineName.startsWith("valist")) { | ||
| return CallVariant.VA_LIST; | ||
| } | ||
| throw VMError.shouldNotReachHere(); | ||
| } | ||
|
|
||
| private native void varargsJavaCallTrampoline(); | ||
|
|
||
| private native void arrayJavaCallTrampoline(); | ||
|
|
||
| private native void valistJavaCallTrampoline(); | ||
|
|
||
| private native void varargsNonvirtualJavaCallTrampoline(); | ||
|
|
||
| private native void arrayNonvirtualJavaCallTrampoline(); | ||
|
|
||
| private native void valistNonvirtualJavaCallTrampoline(); | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
getConstantPoolshould not be needed in this class.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done