< prev index next >

src/hotspot/share/runtime/vmStructs.cpp

Print this page
*** 140,10 ***
--- 140,20 ---
  #include "opto/rootnode.hpp"
  #include "opto/subnode.hpp"
  #include "opto/vectornode.hpp"
  #endif // COMPILER2
  
+ // Used by VMStructs when CompactObjectHeaders are enabled.
+ // Must match the relevant parts from the real oopDesc.
+ class fakeOopDesc {
+ private:
+   union _metadata {
+     Klass*      _klass;
+     narrowKlass _compressed_klass;
+   } _metadata;
+ };
+ 
  // Note: the cross-product of (c1, c2, product, nonproduct, ...),
  // (nonstatic, static), and (unchecked, checked) has not been taken.
  // Only the macros currently needed have been defined.
  
  // A field whose type is not checked is given a null string as the

*** 732,10 ***
--- 742,13 ---
    nonstatic_field(ThreadShadow,                _exception_file,                               const char*)                           \
    nonstatic_field(ThreadShadow,                _exception_line,                               int)                                   \
    nonstatic_field(Thread,                      _active_handles,                               JNIHandleBlock*)                       \
    nonstatic_field(Thread,                      _tlab,                                         ThreadLocalAllocBuffer)                \
    nonstatic_field(Thread,                      _allocated_bytes,                              jlong)                                 \
+   nonstatic_field(JavaThread,                  _lock_stack,                                   LockStack)                             \
+   nonstatic_field(LockStack,                   _top,                                          uint32_t)                              \
+   nonstatic_field(LockStack,                   _base[0],                                      oop)                                   \
    nonstatic_field(NamedThread,                 _name,                                         char*)                                 \
    nonstatic_field(NamedThread,                 _processed_thread,                             Thread*)                               \
    nonstatic_field(JavaThread,                  _threadObj,                                    OopHandle)                             \
    nonstatic_field(JavaThread,                  _anchor,                                       JavaFrameAnchor)                       \
    nonstatic_field(JavaThread,                  _vm_result,                                    oop)                                   \

*** 1237,10 ***
--- 1250,12 ---
    declare_toplevel_type(oopDesc)                                          \
      declare_type(arrayOopDesc, oopDesc)                                   \
        declare_type(objArrayOopDesc, arrayOopDesc)                         \
      declare_type(instanceOopDesc, oopDesc)                                \
                                                                            \
+   declare_toplevel_type(fakeOopDesc)                                      \
+                                                                           \
    /**************************************************/                    \
    /* MetadataOopDesc hierarchy (NOTE: some missing) */                    \
    /**************************************************/                    \
                                                                            \
    declare_toplevel_type(CompiledICHolder)                                 \

*** 1348,10 ***
--- 1363,11 ---
    declare_toplevel_type(OSThread)                                         \
    declare_toplevel_type(JavaFrameAnchor)                                  \
                                                                            \
    declare_toplevel_type(ThreadsSMRSupport)                                \
    declare_toplevel_type(ThreadsList)                                      \
+   declare_toplevel_type(LockStack)                                        \
                                                                            \
    /***************/                                                       \
    /* Interpreter */                                                       \
    /***************/                                                       \
                                                                            \

*** 2469,10 ***
--- 2485,18 ---
    declare_constant(T_ARRAY_size)                                          \
    declare_constant(T_NARROWOOP_size)                                      \
    declare_constant(T_NARROWKLASS_size)                                    \
    declare_constant(T_VOID_size)                                           \
                                                                            \
+   /**********************************************/                        \
+   /* LockingMode enum (globalDefinitions.hpp) */                          \
+   /**********************************************/                        \
+                                                                           \
+   declare_constant(LM_MONITOR)                                            \
+   declare_constant(LM_LEGACY)                                             \
+   declare_constant(LM_LIGHTWEIGHT)                                        \
+                                                                           \
    /*********************/                                                 \
    /* Matcher (C2 only) */                                                 \
    /*********************/                                                 \
                                                                            \
    declare_c2_preprocessor_constant("Matcher::interpreter_frame_pointer_reg", Matcher::interpreter_frame_pointer_reg()) \

*** 2631,15 ***
--- 2655,18 ---
    declare_constant(markWord::age_bits)                                    \
    declare_constant(markWord::lock_bits)                                   \
    declare_constant(markWord::biased_lock_bits)                            \
    declare_constant(markWord::max_hash_bits)                               \
    declare_constant(markWord::hash_bits)                                   \
+   declare_constant(markWord::hash_bits_compact)                           \
                                                                            \
    declare_constant(markWord::lock_shift)                                  \
    declare_constant(markWord::biased_lock_shift)                           \
    declare_constant(markWord::age_shift)                                   \
    declare_constant(markWord::hash_shift)                                  \
+   declare_constant(markWord::hash_shift_compact)                          \
+   LP64_ONLY(declare_constant(markWord::klass_shift))                      \
                                                                            \
    declare_constant(markWord::lock_mask)                                   \
    declare_constant(markWord::lock_mask_in_place)                          \
    declare_constant(markWord::biased_lock_mask)                            \
    declare_constant(markWord::biased_lock_mask_in_place)                   \

*** 2648,10 ***
--- 2675,12 ---
    declare_constant(markWord::age_mask_in_place)                           \
    declare_constant(markWord::epoch_mask)                                  \
    declare_constant(markWord::epoch_mask_in_place)                         \
    declare_constant(markWord::hash_mask)                                   \
    declare_constant(markWord::hash_mask_in_place)                          \
+   declare_constant(markWord::hash_mask_compact)                           \
+   declare_constant(markWord::hash_mask_compact_in_place)                  \
    declare_constant(markWord::biased_lock_alignment)                       \
                                                                            \
    declare_constant(markWord::locked_value)                                \
    declare_constant(markWord::unlocked_value)                              \
    declare_constant(markWord::monitor_value)                               \

*** 2663,12 ***
    declare_constant(markWord::no_lock_in_place)                            \
    declare_constant(markWord::max_age)                                     \
                                                                            \
    /* InvocationCounter constants */                                       \
    declare_constant(InvocationCounter::count_increment)                    \
!   declare_constant(InvocationCounter::count_shift)
! 
  
  //--------------------------------------------------------------------------------
  //
  
  // Generate and check a nonstatic field in non-product builds
--- 2692,14 ---
    declare_constant(markWord::no_lock_in_place)                            \
    declare_constant(markWord::max_age)                                     \
                                                                            \
    /* InvocationCounter constants */                                       \
    declare_constant(InvocationCounter::count_increment)                    \
!   declare_constant(InvocationCounter::count_shift)                        \
!                                                                           \
+   /* ObjectMonitor constants */                                           \
+   declare_constant(ObjectMonitor::ANONYMOUS_OWNER)                        \
  
  //--------------------------------------------------------------------------------
  //
  
  // Generate and check a nonstatic field in non-product builds

*** 3184,5 ***
--- 3215,31 ---
  
  void vmStructs_init() {
    VMStructs::init();
  }
  #endif // ASSERT
+ 
+ void VMStructs::compact_headers_overrides() {
+   assert(UseCompactObjectHeaders, "Should have been checked before");
+ 
+   // We cannot allow SA and other facilities to poke into VM internal fields
+   // expecting the class pointers there. This will crash in the best case,
+   // or yield incorrect execution in the worst case. This code hides the
+   // risky fields from external code by replacing their original container
+   // type to a fake one. The fake type should exist for VMStructs verification
+   // code to work.
+ 
+   size_t len = localHotSpotVMStructsLength();
+   for (size_t off = 0; off < len; off++) {
+     VMStructEntry* e = &localHotSpotVMStructs[off];
+     if (e == nullptr) continue;
+     if (e->typeName == nullptr) continue;
+     if (e->fieldName == nullptr) continue;
+ 
+     if (strcmp(e->typeName, "oopDesc") == 0) {
+       if ((strcmp(e->fieldName, "_metadata._klass") == 0) ||
+           (strcmp(e->fieldName, "_metadata._compressed_klass") == 0)) {
+         e->typeName = "fakeOopDesc";
+       }
+     }
+   }
+ }
< prev index next >