*** old/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VM.java	Thu Apr  5 12:03:45 2018
--- new/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VM.java	Thu Apr  5 12:03:45 2018

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

*** 134,144 ****
--- 134,144 ----
    private static CIntegerType boolType;
    private Boolean sharingEnabled;
    private Boolean compressedOopsEnabled;
    private Boolean compressedKlassPointersEnabled;
  
!   // command line flags supplied to VM - see struct Flag in globals.hpp
!   // command line flags supplied to VM - see struct JVMFlag in jvmFlag.hpp
    public static final class Flag {
       private String type;
       private String name;
       private Address addr;
       private int flags;

*** 903,913 ****
--- 903,913 ----
    }
  
    private void readCommandLineFlags() {
      // get command line flags
      TypeDataBase db = getTypeDataBase();
!     Type flagType = db.lookupType("JVMFlag");
      int numFlags = (int) flagType.getCIntegerField("numFlags").getValue();
      // NOTE: last flag contains null values.
      commandLineFlags = new Flag[numFlags - 1];
  
      Address flagAddr = flagType.getAddressField("flags").getValue();