Mercurial > hg > graal-jvmci-8
changeset 19611:7d5a0223dc44
Truffle: minor ShapeImpl cleanup
author | Andreas Woess <andreas.woess@oracle.com> |
---|---|
date | Fri, 27 Feb 2015 13:55:56 +0100 |
parents | 2625f0dc7b48 |
children | 4efe39251424 |
files | graal/com.oracle.truffle.object/src/com/oracle/truffle/object/ShapeImpl.java |
diffstat | 1 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.truffle.object/src/com/oracle/truffle/object/ShapeImpl.java Fri Feb 27 13:21:16 2015 +0100 +++ b/graal/com.oracle.truffle.object/src/com/oracle/truffle/object/ShapeImpl.java Fri Feb 27 13:55:56 2015 +0100 @@ -353,9 +353,8 @@ */ private ShapeImpl addPropertyInternal(Property prop) { CompilerAsserts.neverPartOfCompilation(); - assert prop.isShadow() || !(this.hasProperty(prop.getKey())) : "duplicate property"; + assert prop.isShadow() || !(this.hasProperty(prop.getKey())) : "duplicate property " + prop.getKey(); assert !getPropertyListInternal(false).contains(prop); - // invalidatePropertyAssumption(prop.getName()); AddPropertyTransition addTransition = new AddPropertyTransition(prop); ShapeImpl cachedShape = queryTransition(addTransition); @@ -653,7 +652,7 @@ newShape = newShape.applyTransition(previous, true); } - getTransitionMapForWrite().put(transition, newShape); + addIndirectTransition(transition, newShape); return newShape; } else { return null; @@ -899,7 +898,7 @@ private Property[] createPropertiesArray() { propertyListAllocCount.inc(); Property[] propertiesArray = new Property[getPropertyCount()]; - List<Property> ownProperties = getPropertyList(ALL); + List<Property> ownProperties = getPropertyList(); assert ownProperties.size() == getPropertyCount(); for (int i = 0; i < getPropertyCount(); i++) { propertiesArray[i] = ownProperties.get(i); @@ -1099,7 +1098,7 @@ /** * Match all filter. */ - public static final Pred<Property> ALL = new Pred<Property>() { + private static final Pred<Property> ALL = new Pred<Property>() { public boolean test(Property t) { return true; }