--- old/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZAddress.java	2020-05-20 18:03:15.545828406 -0700
+++ new/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZAddress.java	2020-05-20 18:03:15.209821954 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -56,11 +56,6 @@
     }
 
     static Address address(long value) {
-        VM vm = VM.getVM();
-        if (vm.getOS().equals("solaris") && vm.getCPU().equals("sparc")) {
-            value |= ZGlobals.ZAddressSpaceStart;
-        }
-
         return ZUtils.longToAddress(value);
     }