Mercurial > hg > graal-jvmci-8

comparison jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProviderImpl.java @ 23398:3e8ce13f4e12

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
minimize diff to jvmci-9
author Doug Simon <doug.simon@oracle.com>
date Tue, 17 May 2016 21:10:34 +0200
parents 1d4ce2d19e52
children 0cbc2bd101c3
comparison
equal deleted inserted replaced
23397:a7b12c1ab514 23398:3e8ce13f4e12
150 } 150 }
151 151
152 @Override 152 @Override
153 public JavaConstant readUnsafeConstant(JavaKind kind, JavaConstant baseConstant, long displacement) { 153 public JavaConstant readUnsafeConstant(JavaKind kind, JavaConstant baseConstant, long displacement) {
154 if (kind == null) { 154 if (kind == null) {
155 throw new IllegalArgumentException(); 155 throw new IllegalArgumentException("null JavaKind");
156 } 156 }
157 if (kind == JavaKind.Object) { 157 if (kind == JavaKind.Object) {
158 Object o = readRawObject(baseConstant, displacement, runtime.getConfig().useCompressedOops); 158 Object o = readRawObject(baseConstant, displacement, runtime.getConfig().useCompressedOops);
159 return HotSpotObjectConstantImpl.forObject(o); 159 return HotSpotObjectConstantImpl.forObject(o);
160 } else { 160 } else {
196 public JavaConstant readObjectConstant(Constant base, long displacement) { 196 public JavaConstant readObjectConstant(Constant base, long displacement) {
197 if (base instanceof HotSpotObjectConstantImpl) { 197 if (base instanceof HotSpotObjectConstantImpl) {
198 Object o = readRawObject(base, displacement, runtime.getConfig().useCompressedOops); 198 Object o = readRawObject(base, displacement, runtime.getConfig().useCompressedOops);
199 return HotSpotObjectConstantImpl.forObject(o); 199 return HotSpotObjectConstantImpl.forObject(o);
200 } 200 }
201 if (!isValidObjectFieldDisplacement(base, displacement)) { 201 assert isValidObjectFieldDisplacement(base, displacement);
202 return null;
203 }
204 return HotSpotObjectConstantImpl.forObject(readRawObject(base, displacement, false)); 202 return HotSpotObjectConstantImpl.forObject(readRawObject(base, displacement, false));
205 } 203 }
206 204
207 @Override 205 @Override
208 public JavaConstant readNarrowOopConstant(Constant base, long displacement, CompressEncoding encoding) { 206 public JavaConstant readNarrowOopConstant(Constant base, long displacement, CompressEncoding encoding) {