*** old/agent/src/share/classes/sun/jvm/hotspot/compiler/ImmutableOopMapSet.java	Mon Sep 14 23:13:27 2015
--- new/agent/src/share/classes/sun/jvm/hotspot/compiler/ImmutableOopMapSet.java	Mon Sep 14 23:13:27 2015

*** 65,77 ****
--- 65,74 ----
            VM.getVM().useDerivedPointerTable()) {
          Assert.that(false, "FIXME: add derived pointer table");
        }
      }
  
      public void visitValueLocation(Address valueAddr) {
      }
  
      public void visitNarrowOopLocation(Address narrowOopAddr) {
        addressVisitor.visitCompOopAddress(narrowOopAddr);
      }
    }
  

*** 214,226 ****
--- 211,223 ----
            visitor.visitDerivedOopLocation(baseLoc, derivedLoc);
          }
        }
      }
  
-     // We want narow oop, value and oop oop_types
!     OopMapValue.OopTypes[] values = new OopMapValue.OopTypes[] {
-         OopMapValue.OopTypes.OOP_VALUE, OopMapValue.OopTypes.VALUE_VALUE, OopMapValue.OopTypes.NARROWOOP_VALUE
!         OopMapValue.OopTypes.OOP_VALUE, OopMapValue.OopTypes.NARROWOOP_VALUE
      };
  
      {
        for (OopMapStream oms = new OopMapStream(map, values); !oms.isDone(); oms.next()) {
          omv = oms.getCurrent();

*** 229,240 ****
--- 226,235 ----
            if (omv.getType() == OopMapValue.OopTypes.OOP_VALUE) {
              // This assert commented out because this will be useful
              // to detect in the debugging system
              // assert(Universe::is_heap_or_null(*loc), "found non oop pointer");
              visitor.visitOopLocation(loc);
            } else if (omv.getType() == OopMapValue.OopTypes.VALUE_VALUE) {
              visitor.visitValueLocation(loc);
            } else if (omv.getType() == OopMapValue.OopTypes.NARROWOOP_VALUE) {
              visitor.visitNarrowOopLocation(loc);
            }
          }
        }