*** old/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotVMConfig.java	Thu Mar 28 11:23:39 2019
--- new/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotVMConfig.java	Thu Mar 28 11:23:39 2019

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 2011, 2019, 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.

*** 22,42 ****
--- 22,43 ----
   */
  package jdk.vm.ci.hotspot.amd64;
  
  import jdk.vm.ci.hotspot.HotSpotVMConfigAccess;
  import jdk.vm.ci.hotspot.HotSpotVMConfigStore;
+ import jdk.vm.ci.services.Services;
  
  /**
   * Used to access AMD64 specific native configuration details.
   */
  class AMD64HotSpotVMConfig extends HotSpotVMConfigAccess {
  
      AMD64HotSpotVMConfig(HotSpotVMConfigStore config) {
          super(config);
      }
  
!     final boolean windowsOs = System.getProperty("os.name", "").startsWith("Windows");
!     final boolean windowsOs = Services.getSavedProperty("os.name", "").startsWith("Windows");
  
      final boolean useCountLeadingZerosInstruction = getFlag("UseCountLeadingZerosInstruction", Boolean.class);
      final boolean useCountTrailingZerosInstruction = getFlag("UseCountTrailingZerosInstruction", Boolean.class);
      final boolean useCompressedOops = getFlag("UseCompressedOops", Boolean.class);