Mercurial > hg > graal-jvmci-8

comparison jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMemoryAccessProviderImpl.java @ 23400:0cbc2bd101c3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revert incorrect assertion and correct javadoc around MemoryAccessProvider.readObjectConstant
author Doug Simon <doug.simon@oracle.com>
date Wed, 18 May 2016 21:31:59 +0200
parents 3e8ce13f4e12
children c9993da505a0
comparison
equal deleted inserted replaced
23399:acfe624d83f5 23400:0cbc2bd101c3
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 assert isValidObjectFieldDisplacement(base, displacement); 201 if (!isValidObjectFieldDisplacement(base, displacement)) {
202 return null;
203 }
202 return HotSpotObjectConstantImpl.forObject(readRawObject(base, displacement, false)); 204 return HotSpotObjectConstantImpl.forObject(readRawObject(base, displacement, false));
203 } 205 }
204 206
205 @Override 207 @Override
206 public JavaConstant readNarrowOopConstant(Constant base, long displacement, CompressEncoding encoding) { 208 public JavaConstant readNarrowOopConstant(Constant base, long displacement, CompressEncoding encoding) {