src/hotspot/share/classfile/systemDictionary.hpp

*** 25,34 ****
--- 25,35 ----
  #ifndef SHARE_CLASSFILE_SYSTEMDICTIONARY_HPP
  #define SHARE_CLASSFILE_SYSTEMDICTIONARY_HPP
  
  #include "classfile/classLoader.hpp"
  #include "jvmci/systemDictionary_jvmci.hpp"
+ #include "oops/fieldStreams.hpp"
  #include "oops/objArrayOop.hpp"
  #include "oops/symbol.hpp"
  #include "runtime/java.hpp"
  #include "runtime/reflectionUtils.hpp"
  #include "runtime/signature.hpp"
*** 168,177 ****
--- 169,179 ----
    do_klass(BootstrapMethodError_klass,                  java_lang_BootstrapMethodError                        ) \
    do_klass(CallSite_klass,                              java_lang_invoke_CallSite                             ) \
    do_klass(Context_klass,                               java_lang_invoke_MethodHandleNatives_CallSiteContext  ) \
    do_klass(ConstantCallSite_klass,                      java_lang_invoke_ConstantCallSite                     ) \
    do_klass(MutableCallSite_klass,                       java_lang_invoke_MutableCallSite                      ) \
+   do_klass(ValueBootstrapMethods_klass,                 java_lang_invoke_ValueBootstrapMethods                ) \
    do_klass(VolatileCallSite_klass,                      java_lang_invoke_VolatileCallSite                     ) \
    /* Note: MethodHandle must be first, and VolatileCallSite last in group */                                    \
                                                                                                                  \
    do_klass(AssertionStatusDirectives_klass,             java_lang_AssertionStatusDirectives                   ) \
    do_klass(StringBuffer_klass,                          java_lang_StringBuffer                                ) \
*** 210,219 ****
--- 212,222 ----
    do_klass(Byte_klass,                                  java_lang_Byte                                        ) \
    do_klass(Short_klass,                                 java_lang_Short                                       ) \
    do_klass(Integer_klass,                               java_lang_Integer                                     ) \
    do_klass(Long_klass,                                  java_lang_Long                                        ) \
                                                                                                                  \
+                                                                                                                          \
    /* JVMCI classes. These are loaded on-demand. */                                                              \
    JVMCI_WK_KLASSES_DO(do_klass)                                                                                 \
                                                                                                                  \
    /*end*/
  
*** 269,278 ****
--- 272,287 ----
                                                Handle class_loader,
                                                Handle protection_domain,
                                                bool is_superclass,
                                                TRAPS);
  
+   static Klass* resolve_flattenable_field_or_fail(AllFieldStream* fs,
+                                                   Handle class_loader,
+                                                   Handle protection_domain,
+                                                   bool throw_error,
+                                                   TRAPS);
+ 
    // Parse new stream. This won't update the dictionary or
    // class hierarchy, simply parse the stream. Used by JVMTI RedefineClasses.
    // Also used by Unsafe_DefineAnonymousClass
    static InstanceKlass* parse_stream(Symbol* class_name,
                                       Handle class_loader,
*** 383,392 ****
--- 392,402 ----
      assert(k != NULL, "klass not loaded");
      return k;
    }
  
    static bool resolve_wk_klass(WKID id, TRAPS);
+   static InstanceKlass* check_klass_ValhallaClasses(InstanceKlass* k) { return k; }
    static void resolve_wk_klasses_until(WKID limit_id, WKID &start_id, TRAPS);
    static void resolve_wk_klasses_through(WKID end_id, WKID &start_id, TRAPS) {
      int limit = (int)end_id + 1;
      resolve_wk_klasses_until((WKID) limit, start_id, THREAD);
    }