Skip to content

Remove Implicit creation work #22975

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

Merged
merged 1 commit into from
Dec 4, 2025
+76 −502
Merged

Remove Implicit creation work #22975

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
1 change: 0 additions & 1 deletion debugtools/DDR_VM/src/com/ibm/j9ddr/CompatibilityConstants29.dat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ J9JavaClassFlags.J9ClassLargestAlignmentConstraintDouble = 0
J9JavaClassFlags.J9ClassLargestAlignmentConstraintReference = 0
J9JavaClassFlags.J9ClassRequiresPrePadding = 0

J9NonbuilderConstants.J9_ROMCLASS_OPTINFO_IMPLICITCREATION_ATTRIBUTE = 0
J9NonbuilderConstants.J9_ROMCLASS_OPTINFO_INJECTED_INTERFACE_INFO = 0
J9NonbuilderConstants.J9_ROMCLASS_OPTINFO_LOADABLEDESCRIPTORS_ATTRIBUTE = 0
J9NonbuilderConstants.J9_ROMCLASS_OPTINFO_PERMITTEDSUBCLASSES_ATTRIBUTE = 0
Expand Down
11 changes: 0 additions & 11 deletions debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/OptInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import static com.ibm.j9ddr.vm29.structure.J9NonbuilderConstants.J9_ROMCLASS_OPTINFO_CLASS_ANNOTATION_INFO;
import static com.ibm.j9ddr.vm29.structure.J9NonbuilderConstants.J9_ROMCLASS_OPTINFO_ENCLOSING_METHOD;
import static com.ibm.j9ddr.vm29.structure.J9NonbuilderConstants.J9_ROMCLASS_OPTINFO_GENERIC_SIGNATURE;
import static com.ibm.j9ddr.vm29.structure.J9NonbuilderConstants.J9_ROMCLASS_OPTINFO_IMPLICITCREATION_ATTRIBUTE;
import static com.ibm.j9ddr.vm29.structure.J9NonbuilderConstants.J9_ROMCLASS_OPTINFO_LOADABLEDESCRIPTORS_ATTRIBUTE;
import static com.ibm.j9ddr.vm29.structure.J9NonbuilderConstants.J9_ROMCLASS_OPTINFO_PERMITTEDSUBCLASSES_ATTRIBUTE;
import static com.ibm.j9ddr.vm29.structure.J9NonbuilderConstants.J9_ROMCLASS_OPTINFO_SIMPLE_NAME;
Expand Down Expand Up @@ -294,14 +293,4 @@ public static J9UTF8Pointer getLoadableDescriptorAtIndex(J9ROMClassPointer romCl
}
return J9UTF8Pointer.NULL;
}

public static U32 getImplicitCreationFlags(J9ROMClassPointer romClass) throws CorruptDataException {
SelfRelativePointer srpPtr = getSRPPtr(J9ROMClassHelper.optionalInfo(romClass), romClass.optionalFlags(),
J9_ROMCLASS_OPTINFO_IMPLICITCREATION_ATTRIBUTE);
if (srpPtr.notNull()) {
U32Pointer u32Ptr = U32Pointer.cast(srpPtr.get());
return u32Ptr.at(0);
}
return U32.MIN;
}
}
4 changes: 0 additions & 4 deletions debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ROMClassHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
package com.ibm.j9ddr.vm29.pointer.helper;

import static com.ibm.j9ddr.vm29.structure.J9JavaAccessFlags.*;
import static com.ibm.j9ddr.vm29.structure.J9NonbuilderConstants.J9_ROMCLASS_OPTINFO_IMPLICITCREATION_ATTRIBUTE;
import static com.ibm.j9ddr.vm29.structure.J9NonbuilderConstants.J9_ROMCLASS_OPTINFO_LOADABLEDESCRIPTORS_ATTRIBUTE;

import com.ibm.j9ddr.CorruptDataException;
Expand Down Expand Up @@ -139,7 +138,4 @@ public static boolean hasLoadableDescriptorsAttribute(J9ROMClassPointer romclass
return romclass.optionalFlags().allBitsIn(J9_ROMCLASS_OPTINFO_LOADABLEDESCRIPTORS_ATTRIBUTE);
}

public static boolean hasImplicitCreationAttribute(J9ROMClassPointer romclass) throws CorruptDataException {
return romclass.optionalFlags().allBitsIn(J9_ROMCLASS_OPTINFO_IMPLICITCREATION_ATTRIBUTE);
}
}
15 changes: 0 additions & 15 deletions debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/RomClassWalker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,11 +737,6 @@ void allSlotsInOptionalInfoDo() throws CorruptDataException {
cursor = cursor.add(1);
}
}
if (J9ROMClassHelper.hasImplicitCreationAttribute(romClass)) {
classWalkerCallback.addSlot(clazz, SlotType.J9_SRP, cursor, "implicitCreationAttributeSRP");
implicitCreationAttributeDo(U32Pointer.cast(cursor.get()));
Copy link
Contributor

@theresa-m theresa-m Nov 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The implicitCreationAttributeDo should also be removed.

cursor = cursor.add(1);
}
classWalkerCallback.addSection(clazz, optionalInfo, cursor.getAddress() - optionalInfo.getAddress(), "optionalInfo", true);
}

Expand Down Expand Up @@ -1003,16 +998,6 @@ void loadableDescriptorsAttributeDo(U32Pointer attribute) throws CorruptDataExce
"loadableDescriptorsAttribute", true);
}

void implicitCreationAttributeDo(U32Pointer attribute) throws CorruptDataException {
if (attribute.isNull()) {
return;
}
U32Pointer attributeStart = attribute;
classWalkerCallback.addSlot(clazz, SlotType.J9_U32, attribute, "implicitCreationFlags");
attribute = attribute.add(1);
classWalkerCallback.addSection(clazz, attributeStart, attribute.getAddress() - attributeStart.getAddress(), "implicitCreationAttribute", true);
}

int allSlotsInAnnotationDo(U32Pointer annotation, String annotationSectionName) throws CorruptDataException {
int increment = 0;
int annotationLength = annotation.at(0).intValue();
Expand Down
5 changes: 0 additions & 5 deletions debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/J9BCUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,11 +651,6 @@ public static void j9bcutil_dumpRomClass(PrintStream out, J9ROMClassPointer romC
}
}

if (J9ROMClassHelper.hasImplicitCreationAttribute(romClass)) {
U32 implicitCreationFlags = OptInfo.getImplicitCreationFlags(romClass);
out.format("ImplicitCreation flags: %s%n", implicitCreationFlags.getHexValue());
}

UDATA romFieldCount = romClass.romFieldCount();
out.append(String.format("Fields (%d):" + nl, romFieldCount.longValue()));

Expand Down
20 changes: 0 additions & 20 deletions runtime/bcutil/ClassFileOracle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,10 +230,6 @@ ClassFileOracle::ClassFileOracle(BufferManager *bufferManager, J9CfrClassFile *c
_hasNonStaticSynchronizedMethod(false),
_loadableDescriptorsAttribute(NULL),
#endif /* defined(J9VM_OPT_VALHALLA_VALUE_TYPES) */
#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
_hasImplicitCreationAttribute(false),
_implicitCreationFlags(0),
#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
_recordComponentCount(0),
_permittedSubclassesAttribute(NULL),
_isSealed(false),
Expand Down Expand Up @@ -560,9 +556,6 @@ ClassFileOracle::walkAttributes()
}
knownAnnotations = addAnnotationBit(knownAnnotations, UNMODIFIABLE_ANNOTATION);
knownAnnotations = addAnnotationBit(knownAnnotations, VALUEBASED_ANNOTATION);
#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
knownAnnotations = addAnnotationBit(knownAnnotations, LOOSELYCONSISTENTVALUE_ANNOTATION);
#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
_annotationsAttribute = (J9CfrAttributeRuntimeVisibleAnnotations *)attrib;
if (0 == _annotationsAttribute->rawDataLength) {
UDATA foundAnnotations = walkAnnotations(_annotationsAttribute->numberOfAnnotations, _annotationsAttribute->annotations, knownAnnotations);
Expand All @@ -575,12 +568,6 @@ ClassFileOracle::walkAttributes()
if (containsKnownAnnotation(foundAnnotations, VALUEBASED_ANNOTATION)) {
_isClassValueBased = true;
}
#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
if (containsKnownAnnotation(foundAnnotations, LOOSELYCONSISTENTVALUE_ANNOTATION)) {
Copy link
Contributor

@theresa-m theresa-m Nov 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can remove all the references to LOOSELYCONSISTENTVALUE_ANNOTATION as well since we aren't doing anything with it right now.

_hasImplicitCreationAttribute = true;
_implicitCreationFlags |= J9AccImplicitCreateNonAtomic;
}
#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
}
break;
}
Expand Down Expand Up @@ -633,13 +620,6 @@ ClassFileOracle::walkAttributes()
break;
}
#endif /* defined(J9VM_OPT_VALHALLA_VALUE_TYPES) */
#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
case CFR_ATTRIBUTE_ImplicitCreation: {
_hasImplicitCreationAttribute = true;
_implicitCreationFlags = ((J9CfrAttributeImplicitCreation *)attrib)->implicitCreationFlags;
break;
}
#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
#if JAVA_SPEC_VERSION >= 11
case CFR_ATTRIBUTE_NestMembers:
/* ignore CFR_ATTRIBUTE_NestMembers for hidden classes, as the nest members never know the name of hidden classes */
Expand Down
9 changes: 0 additions & 9 deletions runtime/bcutil/ClassFileOracle.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1069,10 +1069,6 @@ class RecordComponentIterator
return result;
}
#endif /* defined(J9VM_OPT_VALHALLA_VALUE_TYPES) */
#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
bool hasImplicitCreation() const { return _hasImplicitCreationAttribute; }
U_16 getImplicitCreationFlags() const { return _implicitCreationFlags; }
#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */

U_16 getPermittedSubclassesClassNameAtIndex(U_16 index) const {
U_16 result = 0;
Expand Down Expand Up @@ -1129,7 +1125,6 @@ class RecordComponentIterator
#endif /* JAVA_SPEC_VERSION >= 20 */
#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
NULLRESTRICTED_ANNOTATION,
LOOSELYCONSISTENTVALUE_ANNOTATION,
#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
KNOWN_ANNOTATION_COUNT
};
Expand Down Expand Up @@ -1203,10 +1198,6 @@ class RecordComponentIterator
#if defined(J9VM_OPT_VALHALLA_VALUE_TYPES)
J9CfrAttributeLoadableDescriptors *_loadableDescriptorsAttribute;
#endif /* defined(J9VM_OPT_VALHALLA_VALUE_TYPES) */
#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
bool _hasImplicitCreationAttribute;
U_16 _implicitCreationFlags;
#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
#if JAVA_SPEC_VERSION >= 11
J9CfrAttributeNestMembers *_nestMembers;
#endif /* JAVA_SPEC_VERSION >= 11 */
Expand Down
20 changes: 0 additions & 20 deletions runtime/bcutil/ClassFileWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ DECLARE_UTF8_ATTRIBUTE_NAME(PERMITTED_SUBCLASSES, "PermittedSubclasses");
DECLARE_UTF8_ATTRIBUTE_NAME(LOADABLEDESCRIPTORS, "LoadableDescriptors");
#endif /* defined(J9VM_OPT_VALHALLA_VALUE_TYPES) */
#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
DECLARE_UTF8_ATTRIBUTE_NAME(IMPLICITCREATION, "ImplicitCreation");
DECLARE_UTF8_ATTRIBUTE_NAME(NULLRESTRICTED, "NullRestricted");
#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
#if JAVA_SPEC_VERSION >= 11
Expand Down Expand Up @@ -129,13 +128,6 @@ ClassFileWriter::analyzeROMClass()
}
}
#endif /* defined(J9VM_OPT_VALHALLA_VALUE_TYPES) */
#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
if (J9_ARE_ALL_BITS_SET(_romClass->optionalFlags, J9_ROMCLASS_OPTINFO_IMPLICITCREATION_ATTRIBUTE)) {
U_32 implicitCreationFlags = (U_32)getImplicitCreationFlags(_romClass);
addEntry((void*) &IMPLICITCREATION, 0, CFR_CONSTANT_Utf8);
Copy link
Contributor

@theresa-m theresa-m Nov 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove the IMPLICITCREATION definition in line 71.

addEntry(&implicitCreationFlags, 0, CFR_CONSTANT_Integer);
}
#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
J9EnclosingObject * enclosingObject = getEnclosingMethodForROMClass(_javaVM, NULL, _romClass);
J9UTF8 * genericSignature = getGenericSignatureForROMClass(_javaVM, NULL, _romClass);
J9UTF8 * sourceFileName = getSourceFileNameForROMClass(_javaVM, NULL, _romClass);
Expand Down Expand Up @@ -1048,11 +1040,6 @@ ClassFileWriter::writeAttributes()
attributesCount += 1;
}
#endif /* defined(J9VM_OPT_VALHALLA_VALUE_TYPES) */
#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
if (J9_ARE_ALL_BITS_SET(_romClass->optionalFlags, J9_ROMCLASS_OPTINFO_IMPLICITCREATION_ATTRIBUTE)) {
attributesCount += 1;
}
#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
writeU16(attributesCount);

if ((0 != _romClass->innerClassCount)
Expand Down Expand Up @@ -1237,13 +1224,6 @@ ClassFileWriter::writeAttributes()
}
#endif /* defined(J9VM_OPT_VALHALLA_VALUE_TYPES) */

#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
/* write ImplicitCreation attribute */
if (J9_ARE_ALL_BITS_SET(_romClass->optionalFlags, J9_ROMCLASS_OPTINFO_IMPLICITCREATION_ATTRIBUTE)) {
writeAttributeHeader((J9UTF8 *) &IMPLICITCREATION, sizeof(U_16));
writeU16(getImplicitCreationFlags(_romClass));
}
#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
}

void ClassFileWriter::writeRecordAttribute()
Expand Down
5 changes: 0 additions & 5 deletions runtime/bcutil/ROMClassBuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1439,11 +1439,6 @@ ROMClassBuilder::computeOptionalFlags(ClassFileOracle *classFileOracle, ROMClass
optionalFlags |= J9_ROMCLASS_OPTINFO_LOADABLEDESCRIPTORS_ATTRIBUTE;
}
#endif /* J9VM_OPT_VALHALLA_VALUE_TYPES */
#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
if (classFileOracle->hasImplicitCreation()) {
optionalFlags |= J9_ROMCLASS_OPTINFO_IMPLICITCREATION_ATTRIBUTE;
}
#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
return optionalFlags;
}

Expand Down
33 changes: 0 additions & 33 deletions runtime/bcutil/ROMClassWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,9 +323,6 @@ ROMClassWriter::ROMClassWriter(BufferManager *bufferManager, ClassFileOracle *cl
_injectedInterfaceInfoSRPKey(srpKeyProducer->generateKey()),
_loadableDescriptorsInfoSRPKey(srpKeyProducer->generateKey()),
#endif /* defined(J9VM_OPT_VALHALLA_VALUE_TYPES) */
#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
_implicitCreationSRPKey(srpKeyProducer->generateKey()),
#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
_permittedSubclassesInfoSRPKey(srpKeyProducer->generateKey())
{
_methodNotes = (MethodNotes *) _bufferManager->alloc(classFileOracle->getMethodsCount() * sizeof(MethodNotes));
Expand Down Expand Up @@ -462,9 +459,6 @@ ROMClassWriter::writeROMClass(Cursor *cursor,
writeInjectedInterfaces(cursor, markAndCountOnly);
writeloadableDescriptors(cursor, markAndCountOnly);
#endif /* J9VM_OPT_VALHALLA_VALUE_TYPES */
#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
writeImplicitCreation(cursor, markAndCountOnly);
#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
writeOptionalInfo(cursor);
writeCallSiteData(cursor, markAndCountOnly);
#if defined(J9VM_OPT_METHOD_HANDLE)
Expand Down Expand Up @@ -1931,27 +1925,6 @@ ROMClassWriter::writePermittedSubclasses(Cursor *cursor, bool markAndCountOnly)
}
}

#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
/*
* ImplicitCreation ROM class layout:
* 4 bytes for flags (actually takes up two, but use 4 for alignment)
*/
void
ROMClassWriter::writeImplicitCreation(Cursor *cursor, bool markAndCountOnly)
{
if (_classFileOracle->hasImplicitCreation()) {
cursor->mark(_implicitCreationSRPKey);
Copy link
Contributor

@theresa-m theresa-m Nov 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove _implicitCreationSRPKey from line 327.


U_16 flags = _classFileOracle->getImplicitCreationFlags();
if (markAndCountOnly) {
cursor->skip(sizeof(U_32));
} else {
cursor->writeU32(flags, Cursor::GENERIC);
}
}
}
#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */

#if defined(J9VM_OPT_VALHALLA_VALUE_TYPES)
/*
* LoadableDescriptors ROM class layout:
Expand Down Expand Up @@ -2035,7 +2008,6 @@ ROMClassWriter::writeOptionalInfo(Cursor *cursor)
* SRP to PermittedSubclasses attribute
* SRP to injected interfaces info
* SRP to LoadableDescriptors attribute
* SRP to ImplicitCreation attribute
*/
cursor->mark(_optionalInfoSRPKey);

Expand Down Expand Up @@ -2085,11 +2057,6 @@ ROMClassWriter::writeOptionalInfo(Cursor *cursor)
cursor->writeSRP(_loadableDescriptorsInfoSRPKey, Cursor::SRP_TO_GENERIC);
}
#endif /* defined(J9VM_OPT_VALHALLA_VALUE_TYPES) */
#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
if (_classFileOracle->hasImplicitCreation()) {
cursor->writeSRP(_implicitCreationSRPKey, Cursor::SRP_TO_GENERIC);
Copy link
Contributor

@theresa-m theresa-m Nov 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove the declaration for _implicitCreationSRPKey as well as the comment SRP to ImplicitCreation attribute in ROMClassWriter.cpp.

}
#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
}

void
Expand Down
6 changes: 0 additions & 6 deletions runtime/bcutil/ROMClassWriter.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,6 @@ class ROMClassWriter
void writeInjectedInterfaces(Cursor *cursor, bool markAndCountOnly);
void writeloadableDescriptors(Cursor *cursor, bool markAndCountOnly);
#endif /* J9VM_OPT_VALHALLA_VALUE_TYPES */
#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
void writeImplicitCreation(Cursor *cursor, bool markAndCountOnly);
#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */

BufferManager *_bufferManager;
ClassFileOracle *_classFileOracle;
Expand Down Expand Up @@ -199,9 +196,6 @@ class ROMClassWriter
UDATA _injectedInterfaceInfoSRPKey;
UDATA _loadableDescriptorsInfoSRPKey;
#endif /* defined(J9VM_OPT_VALHALLA_VALUE_TYPES) */
#if defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES)
UDATA _implicitCreationSRPKey;
#endif /* defined(J9VM_OPT_VALHALLA_FLATTENABLE_VALUE_TYPES) */
};

#endif /* ROMCLASSWRITER_HPP_ */
1 change: 0 additions & 1 deletion runtime/bcutil/attrlookup.gperf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,5 @@ NestMembers, CFR_ATTRIBUTE_NestMembers, CFR_ATTRIBUTE_NestMembers
NestHost, CFR_ATTRIBUTE_NestHost, CFR_ATTRIBUTE_NestHost
Record, CFR_ATTRIBUTE_Record, CFR_ATTRIBUTE_Record
PermittedSubclasses, CFR_ATTRIBUTE_PermittedSubclasses, CFR_ATTRIBUTE_PermittedSubclasses
ImplicitCreation, CFR_ATTRIBUTE_ImplicitCreation, CFR_ATTRIBUTE_ImplicitCreation
LoadableDescriptors, CFR_ATTRIBUTE_LoadableDescriptors, CFR_ATTRIBUTE_LoadableDescriptors
NullRestricted, CFR_ATTRIBUTE_NullRestricted, CFR_ATTRIBUTE_NullRestricted
16 changes: 7 additions & 9 deletions runtime/bcutil/attrlookup.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ struct AttribType
U_8 strippedAttribCode;
};

#define TOTAL_KEYWORDS 31
#define TOTAL_KEYWORDS 30
#define MIN_WORD_LENGTH 4
#define MAX_WORD_LENGTH 36
#define MIN_HASH_VALUE 4
Expand Down Expand Up @@ -88,7 +88,7 @@ attributeHash (register const char *str, register size_t len)
51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
51, 31, 51, 51, 51, 15, 51, 51, 51, 5,
51, 31, 51, 51, 51, 15, 51, 51, 51, 51,
0, 0, 51, 51, 51, 51, 15, 0, 51, 51,
25, 0, 51, 51, 51, 51, 51, 51, 51, 51,
51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
Expand Down Expand Up @@ -129,7 +129,7 @@ lookupKnownAttribute (register const char *str, register size_t len)
{"InnerClasses", CFR_ATTRIBUTE_InnerClasses, CFR_ATTRIBUTE_InnerClasses},
#line 55 "attrlookup.gperf"
{"ConstantValue", CFR_ATTRIBUTE_ConstantValue, CFR_ATTRIBUTE_ConstantValue},
#line 77 "attrlookup.gperf"
#line 76 "attrlookup.gperf"
{"NullRestricted", CFR_ATTRIBUTE_NullRestricted, CFR_ATTRIBUTE_NullRestricted},
#line 57 "attrlookup.gperf"
{"EnclosingMethod", CFR_ATTRIBUTE_EnclosingMethod, CFR_ATTRIBUTE_EnclosingMethod},
Expand All @@ -139,12 +139,10 @@ lookupKnownAttribute (register const char *str, register size_t len)
{"AnnotationDefault", CFR_ATTRIBUTE_AnnotationDefault, CFR_ATTRIBUTE_AnnotationDefault},
#line 61 "attrlookup.gperf"
{"LocalVariableTable", CFR_ATTRIBUTE_LocalVariableTable, CFR_ATTRIBUTE_StrippedLocalVariableTable},
#line 76 "attrlookup.gperf"
#line 75 "attrlookup.gperf"
{"LoadableDescriptors", CFR_ATTRIBUTE_LoadableDescriptors, CFR_ATTRIBUTE_LoadableDescriptors},
#line 62 "attrlookup.gperf"
{"SourceDebugExtension", CFR_ATTRIBUTE_SourceDebugExtension, CFR_ATTRIBUTE_StrippedSourceDebugExtension},
#line 75 "attrlookup.gperf"
{"ImplicitCreation", CFR_ATTRIBUTE_ImplicitCreation, CFR_ATTRIBUTE_ImplicitCreation},
#line 63 "attrlookup.gperf"
{"LocalVariableTypeTable", CFR_ATTRIBUTE_LocalVariableTypeTable, CFR_ATTRIBUTE_StrippedLocalVariableTypeTable},
#line 48 "attrlookup.gperf"
Expand Down Expand Up @@ -186,9 +184,9 @@ lookupKnownAttribute (register const char *str, register size_t len)
static const signed char lookup[] =
{
-1, -1, -1, -1, 0, -1, -1, -1, -1, 1, 2, -1, 3, 4,
5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, 17,
18, 19, 20, 21, -1, -1, 22, 23, 24, 25, -1, 26, -1, 27,
28, -1, -1, -1, -1, 29, -1, -1, 30
5, 6, 7, 8, 9, 10, 11, -1, 12, 13, 14, 15, -1, 16,
17, 18, 19, 20, -1, -1, 21, 22, 23, 24, -1, 25, -1, 26,
27, -1, -1, -1, -1, 28, -1, -1, 29
};

if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
Expand Down
Loading