fixup

Author: Aditi Srinivas

runtime/bcutil/attrlookup.h

@@ -1,25 +1,3 @@
-/*******************************************************************************
- * Copyright IBM Corp. and others 1991
- *
- * 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] https://openjdk.org/legal/assembly-exception.html
- *
- * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
- *******************************************************************************/
-
 /* ANSI-C code produced by gperf version 3.1 */
 /* Command-line: gperf -CD -t --output-file=attrlookup.h attrlookup.gperf  */
 /* Computed positions: -k'2' */
@@ -59,7 +37,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
@@ -73,7 +51,7 @@ __inline
 inline
 #endif
 #endif
-static size_t
+static unsigned int
 attributeHash (register const char *str, register size_t len)
 {
   static const unsigned char asso_values[] =
@@ -88,7 +66,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,
@@ -108,12 +86,6 @@ attributeHash (register const char *str, register size_t len)
   return len + asso_values[(unsigned char)str[1]];
 }
 
-#ifdef __GNUC__
-__inline
-#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
-__attribute__ ((__gnu_inline__))
-#endif
-#endif
 const struct AttribType *
 lookupKnownAttribute (register const char *str, register size_t len)
 {
@@ -129,7 +101,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},
@@ -139,12 +111,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"
@@ -186,14 +156,14 @@ 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)
     {
-      register size_t key = attributeHash (str, len);
+      register unsigned int key = attributeHash (str, len);
 
       if (key <= MAX_HASH_VALUE)
         {

runtime/oti/j9javaaccessflags.h

@@ -193,5 +193,4 @@
 		(J9StaticFieldRefStrictInitWritten == ((classAndFlags) & J9StaticFieldRefStrictInitMask))
 #endif /* defined(J9VM_OPT_VALHALLA_STRICT_FIELDS) */
 
-
 #endif /*J9JAVAACCESSFLAGS_H */