Mercurial > hg > graal-jvmci-8
comparison jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java @ 23366:45168ac6d3bc
Merge.
author | Roland Schatz <roland.schatz@oracle.com> |
---|---|
date | Fri, 29 Apr 2016 11:10:18 +0200 |
parents | 30af491f98c5 b05ad394cfd5 |
children | 802821d82a92 |
comparison
equal
deleted
inserted
replaced
23365:30af491f98c5 | 23366:45168ac6d3bc |
---|---|
508 if (result == null) { | 508 if (result == null) { |
509 result = new HotSpotResolvedJavaFieldImpl(this, fieldName, type, offset, rawFlags); | 509 result = new HotSpotResolvedJavaFieldImpl(this, fieldName, type, offset, rawFlags); |
510 fieldCache.put(id, result); | 510 fieldCache.put(id, result); |
511 } else { | 511 } else { |
512 assert result.getName().equals(fieldName); | 512 assert result.getName().equals(fieldName); |
513 // assert result.getType().equals(type); | 513 assert result.getType().equals(type); |
514 assert result.offset() == offset; | 514 assert result.offset() == offset; |
515 assert result.getModifiers() == flags; | 515 assert result.getModifiers() == flags; |
516 } | 516 } |
517 | 517 |
518 return result; | 518 return result; |
901 | 901 |
902 @Override | 902 @Override |
903 public String toString() { | 903 public String toString() { |
904 return "HotSpotType<" + getName() + ", resolved>"; | 904 return "HotSpotType<" + getName() + ", resolved>"; |
905 } | 905 } |
906 | |
907 @Override | |
908 public boolean isAllocationCloneable() { | |
909 return (getAccessFlags() & config().jvmAccIsCloneable) != 0; | |
910 } | |
906 } | 911 } |