src/share/vm/opto/memnode.cpp

rev 8961 : [mq]: diff-shenandoah.patch

*** 39,48 ****
--- 39,49 ----
  #include "opto/memnode.hpp"
  #include "opto/mulnode.hpp"
  #include "opto/narrowptrnode.hpp"
  #include "opto/phaseX.hpp"
  #include "opto/regmask.hpp"
+ #include "opto/shenandoahSupport.hpp"
  #include "utilities/copy.hpp"
  
  // Portions of code courtesy of Clifford Click
  
  // Optimization - Graph Style
*** 998,1007 ****
--- 999,1009 ----
      // Load boxed value from result of valueOf() call is input parameter.
      if (this->is_Load() && ld_adr->is_AddP() &&
          (tp != NULL) && tp->is_ptr_to_boxed_value()) {
        intptr_t ignore = 0;
        Node* base = AddPNode::Ideal_base_and_offset(ld_adr, phase, ignore);
+       base = ShenandoahBarrierNode::skip_through_barrier(base);
        if (base != NULL && base->is_Proj() &&
            base->as_Proj()->_con == TypeFunc::Parms &&
            base->in(0)->is_CallStaticJava() &&
            base->in(0)->as_CallStaticJava()->is_boxing_method()) {
          return base->in(0)->in(TypeFunc::Parms);
*** 1601,1611 ****
      // Different array types begin at slightly different offsets (12 vs. 16).
      // We choose T_BYTE as an example base type that is least restrictive
      // as to alignment, which will therefore produce the smallest
      // possible base offset.
      const int min_base_off = arrayOopDesc::base_offset_in_bytes(T_BYTE);
!     const bool off_beyond_header = ((uint)off >= (uint)min_base_off);
  
      // Try to constant-fold a stable array element.
      if (FoldStableValues && ary->is_stable() && ary->const_oop() != NULL) {
        // Make sure the reference is not into the header and the offset is constant
        if (off_beyond_header && adr->is_AddP() && off != Type::OffsetBot) {
--- 1603,1613 ----
      // Different array types begin at slightly different offsets (12 vs. 16).
      // We choose T_BYTE as an example base type that is least restrictive
      // as to alignment, which will therefore produce the smallest
      // possible base offset.
      const int min_base_off = arrayOopDesc::base_offset_in_bytes(T_BYTE);
!     const bool off_beyond_header = (off != -8 || !UseShenandoahGC) && ((uint)off >= (uint)min_base_off);
  
      // Try to constant-fold a stable array element.
      if (FoldStableValues && ary->is_stable() && ary->const_oop() != NULL) {
        // Make sure the reference is not into the header and the offset is constant
        if (off_beyond_header && adr->is_AddP() && off != Type::OffsetBot) {