forked from eclipse-openj9/openj9
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Details are in the issues below. Fixes: eclipse-openj9#11993 Fixes: eclipse-openj9#11990 Most of the work was done by Sharon Wang. Creating this PR on her behalf. Signed-off-by: Tobi Ajila <atobia@ca.ibm.com>
- Loading branch information
Showing
17 changed files
with
1,252 additions
and
27 deletions.
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
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,43 @@ | ||
| ################################################################################ | ||
| # Copyright (c) 2021, 2021 IBM Corp. and others | ||
| # | ||
| # This program and the accompanying materials are made available under | ||
| # the terms of the Eclipse Public License 2.0 which accompanies this | ||
| # distribution and is available at https://www.eclipse.org/legal/epl-2.0/ | ||
| # or the Apache License, Version 2.0 which accompanies this distribution and | ||
| # is available at https://www.apache.org/licenses/LICENSE-2.0. | ||
| # | ||
| # This Source Code may also be made available under the following | ||
| # Secondary Licenses when the conditions for such availability set | ||
| # forth in the Eclipse Public License, v. 2.0 are satisfied: GNU | ||
| # General Public License, version 2 with the GNU Classpath | ||
| # Exception [1] and GNU General Public License, version 2 with the | ||
| # OpenJDK Assembly Exception [2]. | ||
| # | ||
| # [1] https://www.gnu.org/software/classpath/license.html | ||
| # [2] http://openjdk.java.net/legal/assembly-exception.html | ||
| # | ||
| # SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception | ||
| ################################################################################ | ||
|
|
||
| set(OMR_ENHANCED_WARNINGS OFF) | ||
|
|
||
| j9vm_add_library(anntests SHARED | ||
| annhelp_tests.c | ||
| ) | ||
|
|
||
| target_link_libraries(anntests | ||
| PRIVATE | ||
| j9vm_interface | ||
| jvm | ||
| ) | ||
|
|
||
| omr_add_exports(annotationtests | ||
| Java_org_openj9_test_annotation_ContainsRuntimeAnnotationTest_containsRuntimeAnnotation | ||
| ) | ||
|
|
||
| install( | ||
| TARGETS anntests | ||
| LIBRARY DESTINATION ${j9vm_SOURCE_DIR} | ||
| RUNTIME DESTINATION ${j9vm_SOURCE_DIR} | ||
| ) |
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,84 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2021, 2021 IBM Corp. and others | ||
| * | ||
| * This program and the accompanying materials are made available under | ||
| * the terms of the Eclipse Public License 2.0 which accompanies this | ||
| * distribution and is available at https://www.eclipse.org/legal/epl-2.0/ | ||
| * or the Apache License, Version 2.0 which accompanies this distribution and | ||
| * is available at https://www.apache.org/licenses/LICENSE-2.0. | ||
| * | ||
| * This Source Code may also be made available under the following | ||
| * Secondary Licenses when the conditions for such availability set | ||
| * forth in the Eclipse Public License, v. 2.0 are satisfied: GNU | ||
| * General Public License, version 2 with the GNU Classpath | ||
| * Exception [1] and GNU General Public License, version 2 with the | ||
| * OpenJDK Assembly Exception [2]. | ||
| * | ||
| * [1] https://www.gnu.org/software/classpath/license.html | ||
| * [2] http://openjdk.java.net/legal/assembly-exception.html | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception | ||
| *******************************************************************************/ | ||
|
|
||
| #include "vmaccess.h" | ||
|
|
||
| /** | ||
| * Checks if a field or method contains the runtime annotation specified. | ||
| * | ||
| * @param env The JNI environment. | ||
| * @param jlClass The class that the fieldref or method belongs to. | ||
| * @param cpIndex The constant pool index of the fieldref or methodref. | ||
| * @param annotationNameString The name of the annotation to check for. | ||
| * @param isField True if checking for a field, false if checking a method. | ||
| * @return JNI_TRUE if the annotation is found, JNI_FALSE otherwise. | ||
| */ | ||
| jboolean JNICALL | ||
| Java_org_openj9_test_annotation_ContainsRuntimeAnnotationTest_containsRuntimeAnnotation(JNIEnv *env, jclass unused, jclass jlClass, jint cpIndex, jstring annotationNameString, jboolean isField, jint type) | ||
| { | ||
| jboolean result = JNI_FALSE; | ||
| J9VMThread *currentThread = (J9VMThread *)env; | ||
| J9JavaVM *vm = currentThread->javaVM; | ||
| J9InternalVMFunctions *vmFuncs = vm->internalVMFunctions; | ||
| PORT_ACCESS_FROM_JAVAVM(vm); | ||
|
|
||
| if (NULL == annotationNameString) { | ||
| vmFuncs->setCurrentExceptionUTF(currentThread, J9VMCONSTANTPOOL_JAVALANGNULLPOINTEREXCEPTION, "annotation name is null"); | ||
| } else { | ||
| vmFuncs->internalEnterVMFromJNI(currentThread); | ||
|
|
||
| j9object_t annotationNameObj = J9_JNI_UNWRAP_REFERENCE(annotationNameString); | ||
| char annotationNameStackBuffer[J9VM_PACKAGE_NAME_BUFFER_LENGTH] = {0}; | ||
| J9UTF8 *annotationNameUTF8 = vmFuncs->copyStringToJ9UTF8WithMemAlloc( | ||
| currentThread, | ||
| annotationNameObj, | ||
| J9_STR_NULL_TERMINATE_RESULT, | ||
| "", | ||
| 0, | ||
| annotationNameStackBuffer, | ||
| 0); | ||
|
|
||
| if (NULL == annotationNameUTF8) { | ||
| vmFuncs->setNativeOutOfMemoryError(currentThread, 0, 0); | ||
| } else { | ||
| J9Class *clazz = J9VM_J9CLASS_FROM_HEAPCLASS(currentThread, J9_JNI_UNWRAP_REFERENCE(jlClass)); | ||
|
|
||
| if (NULL == clazz) { | ||
| vmFuncs->setCurrentExceptionUTF(currentThread, J9VMCONSTANTPOOL_JAVALANGNULLPOINTEREXCEPTION, "class cannot be found"); | ||
| } else { | ||
| if (isField) { | ||
| result = (jboolean)vmFuncs->fieldContainsRuntimeAnnotation(currentThread, clazz, (UDATA)cpIndex, annotationNameUTF8); | ||
| } else { | ||
| result = (jboolean)vmFuncs->methodContainsRuntimeAnnotation(currentThread, clazz, (UDATA)cpIndex, annotationNameUTF8, (UDATA)type); | ||
| } | ||
| } | ||
|
|
||
| if ((J9UTF8 *)annotationNameStackBuffer != annotationNameUTF8) { | ||
| j9mem_free_memory(annotationNameUTF8); | ||
| } | ||
| } | ||
|
|
||
| vmFuncs->internalExitVMToJNI(currentThread); | ||
| } | ||
|
|
||
| return result; | ||
| } |
Oops, something went wrong.