Skip to content
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.

Sign up for GitHub

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

Jump to bottom

(v0.22.0) Add host class package to anon class name for 11+ #10482

Merged
merged 1 commit into from
Aug 28, 2020
Merged

(v0.22.0) Add host class package to anon class name for 11+ #10482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 19 additions & 9 deletions runtime/bcutil/ROMClassBuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ j9bcutil_buildRomClass(J9LoadROMClassData *loadData, U_8 * intermediateData, UDA

ROMClassCreationContext context(
PORTLIB, javaVM, loadData->classData, loadData->classDataLength, bctFlags, bcuFlags, findClassFlags, &romClassSegmentAllocationStrategy,
loadData->className, loadData->classNameLength, intermediateData, (U_32) intermediateDataLength, loadData->romClass, loadData->classBeingRedefined,
loadData->className, loadData->classNameLength, loadData->hostPackageName, loadData->hostPackageLength, intermediateData, (U_32) intermediateDataLength, loadData->romClass, loadData->classBeingRedefined,
loadData->classLoader, (0 != classFileBytesReplaced), (TRUE == isIntermediateROMClass), localBuffer);

BuildResult result = romClassBuilder->buildROMClass(&context);
Expand Down Expand Up @@ -250,7 +250,7 @@ ROMClassBuilder::buildROMClass(ROMClassCreationContext *context)
}

BuildResult
ROMClassBuilder::handleAnonClassName(J9CfrClassFile *classfile, bool *isLambda)
ROMClassBuilder::handleAnonClassName(J9CfrClassFile *classfile, bool *isLambda, U_8* hostPackageName, UDATA hostPackageLength)
{
J9CfrConstantPoolInfo* constantPool = classfile->constantPool;
U_32 cpThisClassUTF8Slot = constantPool[classfile->thisClass].slot1;
Expand All @@ -260,10 +260,16 @@ ROMClassBuilder::handleAnonClassName(J9CfrClassFile *classfile, bool *isLambda)
U_32 i = 0;
BOOLEAN stringOrNASReferenceToClassName = FALSE;
BOOLEAN newCPEntry = TRUE;
UDATA newAnonClassNameLength = originalStringLength + 1 + ROM_ADDRESS_LENGTH + 1;
BuildResult result = OK;
PORT_ACCESS_FROM_PORT(_portLibrary);

/* check if adding host package name to anonymous class is needed */
UDATA newHostPackageLength = 0;
if (memcmp(originalStringBytes, hostPackageName, hostPackageLength) != 0) {
newHostPackageLength = hostPackageLength + 1;
}
UDATA newAnonClassNameLength = originalStringLength + 1 + ROM_ADDRESS_LENGTH + 1 + newHostPackageLength;

/* check if the class is a lambda class */
if (NULL != getLastDollarSignOfLambdaClassName(originalStringBytes, originalStringLength)) {
*isLambda = true;
Expand Down Expand Up @@ -314,7 +320,7 @@ ROMClassBuilder::handleAnonClassName(J9CfrClassFile *classfile, bool *isLambda)
}

/* calculate the size of the new string and create new cpEntry*/
anonClassName->slot1 = originalStringLength + ROM_ADDRESS_LENGTH + 1;
anonClassName->slot1 = (U_32)newAnonClassNameLength - 1;
if (newCPEntry) {
anonClassName->slot2 = 0;
anonClassName->tag = CFR_CONSTANT_Utf8;
Expand All @@ -326,10 +332,14 @@ ROMClassBuilder::handleAnonClassName(J9CfrClassFile *classfile, bool *isLambda)
constantPool[classfile->thisClass].slot1 = newUtfCPEntry;

/* copy the name into the new location and add the special character, fill the rest with zeroes */
memcpy (constantPool[newUtfCPEntry].bytes, originalStringBytes, originalStringLength);
*(U_8*)((UDATA) constantPool[newUtfCPEntry].bytes + originalStringLength) = ANON_CLASSNAME_CHARACTER_SEPARATOR;
memset(constantPool[newUtfCPEntry].bytes + originalStringLength + 1, '0', ROM_ADDRESS_LENGTH);
*(U_8*)((UDATA) constantPool[newUtfCPEntry].bytes + originalStringLength + 1 + ROM_ADDRESS_LENGTH) = '\0';
if (newHostPackageLength > 0 ) {
memcpy(constantPool[newUtfCPEntry].bytes, hostPackageName, newHostPackageLength - 1);
*(U_8*)((UDATA) constantPool[newUtfCPEntry].bytes + newHostPackageLength - 1) = ANON_CLASSNAME_CHARACTER_SEPARATOR;
}
memcpy (constantPool[newUtfCPEntry].bytes + newHostPackageLength, originalStringBytes, originalStringLength);
*(U_8*)((UDATA) constantPool[newUtfCPEntry].bytes + newHostPackageLength + originalStringLength) = ANON_CLASSNAME_CHARACTER_SEPARATOR;
memset(constantPool[newUtfCPEntry].bytes + newHostPackageLength + originalStringLength + 1, '0', ROM_ADDRESS_LENGTH);
*(U_8*)((UDATA) constantPool[newUtfCPEntry].bytes + newHostPackageLength + originalStringLength + 1 + ROM_ADDRESS_LENGTH) = '\0';

/* search constantpool for all other identical classRefs. We have not actually
* tested this scenario as javac will not output more than one classRef or utfRef of the
Expand Down Expand Up @@ -430,7 +440,7 @@ ROMClassBuilder::prepareAndLaydown( BufferManager *bufferManager, ClassFileParse

bool isLambda = false;
if (context->isClassAnon() || context->isClassHidden()) {
BuildResult res = handleAnonClassName(classFileParser->getParsedClassFile(), &isLambda);
BuildResult res = handleAnonClassName(classFileParser->getParsedClassFile(), &isLambda, context->hostPackageName(), context->hostPackageLength());
if (OK != res) {
return res;
}
Expand Down
4 changes: 2 additions & 2 deletions runtime/bcutil/ROMClassBuilder.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2001, 2019 IBM Corp. and others
* Copyright (c) 2001, 2020 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
Expand Down Expand Up @@ -122,7 +122,7 @@ class ROMClassBuilder
U_8 *_bufferManagerBuffer;
StringInternTable _stringInternTable;

BuildResult handleAnonClassName(J9CfrClassFile *classfile, bool *isLambda);
BuildResult handleAnonClassName(J9CfrClassFile *classfile, bool *isLambda, U_8* hostPackageName, UDATA hostPackageLength);
U_32 computeExtraModifiers(ClassFileOracle *classFileOracle, ROMClassCreationContext *context);
U_32 computeOptionalFlags(ClassFileOracle *classFileOracle, ROMClassCreationContext *context);
BuildResult prepareAndLaydown( BufferManager *bufferManager, ClassFileParser *classFileParser, ROMClassCreationContext *context );
Expand Down
14 changes: 12 additions & 2 deletions runtime/bcutil/ROMClassCreationContext.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ class ROMClassCreationContext
_clazz(NULL),
_className(NULL),
_classNameLength(0),
_hostPackageName(NULL),
_hostPackageLength(0),
_intermediateClassData(NULL),
_intermediateClassDataLength(0),
_classLoader(NULL),
Expand Down Expand Up @@ -89,6 +91,8 @@ class ROMClassCreationContext
_clazz(NULL),
_className(NULL),
_classNameLength(0),
_hostPackageName(NULL),
_hostPackageLength(0),
_intermediateClassData(NULL),
_intermediateClassDataLength(0),
_classLoader(NULL),
Expand All @@ -115,8 +119,8 @@ class ROMClassCreationContext

ROMClassCreationContext(
J9PortLibrary *portLibrary, J9JavaVM *javaVM, U_8 *classFileBytes, UDATA classFileSize, UDATA bctFlags, UDATA bcuFlags, UDATA findClassFlags, AllocationStrategy *allocationStrategy,
U_8 *className, UDATA classNameLength, U_8 *intermediateClassData, U_32 intermediateClassDataLength, J9ROMClass *romClass, J9Class *clazz, J9ClassLoader *classLoader, bool classFileBytesReplaced,
bool creatingIntermediateROMClass, J9TranslationLocalBuffer *localBuffer) :
U_8 *className, UDATA classNameLength, U_8 *hostPackageName, UDATA hostPackageLength, U_8 *intermediateClassData, U_32 intermediateClassDataLength, J9ROMClass *romClass, J9Class *clazz,
J9ClassLoader *classLoader, bool classFileBytesReplaced, bool creatingIntermediateROMClass, J9TranslationLocalBuffer *localBuffer) :
_portLibrary(portLibrary),
_javaVM(javaVM),
_classFileBytes(classFileBytes),
Expand All @@ -129,6 +133,8 @@ class ROMClassCreationContext
_clazz(clazz),
_className(className),
_classNameLength(classNameLength),
_hostPackageName(hostPackageName),
_hostPackageLength(hostPackageLength),
_intermediateClassData(intermediateClassData),
_intermediateClassDataLength(intermediateClassDataLength),
_classLoader(classLoader),
Expand Down Expand Up @@ -178,6 +184,8 @@ class ROMClassCreationContext
UDATA findClassFlags() const {return _findClassFlags; }
U_8* className() const {return _className; }
UDATA classNameLength() const {return _classNameLength; }
U_8* hostPackageName() const {return _hostPackageName; }
UDATA hostPackageLength() const {return _hostPackageLength; }
U_32 bctFlags() const { return (U_32) _bctFlags; } /* Only use this for j9bcutil_readClassFileBytes */
AllocationStrategy *allocationStrategy() const { return _allocationStrategy; }
bool classFileBytesReplaced() const { return _classFileBytesReplaced; }
Expand Down Expand Up @@ -735,6 +743,8 @@ class ROMClassCreationContext
J9Class *_clazz;
U_8 *_className;
UDATA _classNameLength;
U_8* _hostPackageName;
UDATA _hostPackageLength;
U_8 *_intermediateClassData;
U_32 _intermediateClassDataLength;
J9ClassLoader *_classLoader;
Expand Down
8 changes: 8 additions & 0 deletions runtime/bcutil/defineclass.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,14 @@ internalDefineClass(
loadData.freeFunction = NULL;
loadData.romClass = existingROMClass;

loadData.hostPackageName = NULL;
loadData.hostPackageLength = 0;
if (isAnonFlagSet && (J2SE_VERSION(vm) >= J2SE_V11)) {
J9ROMClass *hostROMClass = hostClass->romClass;
loadData.hostPackageName = J9UTF8_DATA(J9ROMCLASS_CLASSNAME(hostROMClass));
loadData.hostPackageLength = packageNameLength(hostROMClass);
}

if (J9_ARE_NO_BITS_SET(options, J9_FINDCLASS_FLAG_NO_CHECK_FOR_EXISTING_CLASS)) {
/* For non-bootstrap classes, this check is done in jcldefine.c:defineClassCommon(). */
if (checkForExistingClass(vmThread, &loadData) != NULL) {
Expand Down
2 changes: 2 additions & 0 deletions runtime/oti/j9nonbuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,6 +769,8 @@ typedef struct J9LoadROMClassData {
j9object_t classDataObject;
struct J9ClassLoader* classLoader;
j9object_t protectionDomain;
U_8* hostPackageName;
UDATA hostPackageLength;
UDATA options;
struct J9ROMClass* romClass;
struct J9MemorySegment* romClassSegment;
Expand Down
7 changes: 7 additions & 0 deletions runtime/util/hshelp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3531,6 +3531,13 @@ reloadROMClasses(J9VMThread * currentThread, jint class_count, const jvmtiClassD
loadData.protectionDomain = J9VMJAVALANGCLASS_PROTECTIONDOMAIN(currentThread, heapClass);
loadData.options = options;

loadData.hostPackageName = NULL;
loadData.hostPackageLength = 0;
if ((J2SE_VERSION(vm) >= J2SE_V11) && J9_ARE_ALL_BITS_SET(originalRAMClass->classFlags, J9ClassIsAnonymous)) {
J9ROMClass *hostROMClass = originalRAMClass->hostClass->romClass;
loadData.hostPackageName = J9UTF8_DATA(J9ROMCLASS_CLASSNAME(hostROMClass));;
loadData.hostPackageLength = packageNameLength(hostROMClass);
}

loadData.freeUserData = NULL;
loadData.freeFunction = NULL;
Expand Down