diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/attributes/GetAttributeNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/attributes/GetAttributeNode.java index 9055f8c476bb8823aa450f97b38caae1ef9615c5..0a28d002af32b82684ecf48e4f815256e363c859 100644 --- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/attributes/GetAttributeNode.java +++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/attributes/GetAttributeNode.java @@ -48,9 +48,8 @@ public abstract class GetAttributeNode extends AttributeAccessNode { protected Object getAttrCached(DynamicObject attrs, String name, @Cached("name") String cachedName, @Cached("lookupShape(attrs)") Shape shape, - @Cached("lookupLocation(shape, name)") Location location, - @Cached("createBinaryProfile()") ConditionProfile nullProfile) { - return nullProfile.profile(location == null) ? null : location.get(attrs); + @Cached("lookupLocation(shape, name)") Location location) { + return location == null ? null : location.get(attrs); } @TruffleBoundary diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/attributes/GetFixedAttributeNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/attributes/GetFixedAttributeNode.java index 0c6a29dc624e0aaee9b079ec2ff3ea4450ec9073..35b79c0d788b2e5f0ac8b45900b880778437d283 100644 --- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/attributes/GetFixedAttributeNode.java +++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/attributes/GetFixedAttributeNode.java @@ -65,9 +65,8 @@ public abstract class GetFixedAttributeNode extends FixedAttributeAccessNode { @SuppressWarnings("unused") protected Object getAttrCached(DynamicObject attrs, @Cached("lookupShape(attrs)") Shape shape, - @Cached("lookupLocation(shape, name)") Location location, - @Cached("createBinaryProfile()") ConditionProfile nullProfile) { - return nullProfile.profile(location == null) ? null : location.get(attrs); + @Cached("lookupLocation(shape, name)") Location location) { + return location == null ? null : location.get(attrs); } @Specialization(contains = "getAttrCached") diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/attributes/RemoveFixedAttributeNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/attributes/RemoveFixedAttributeNode.java index 9c8b21ee3c8e74492b8a7e3f42c472f4e4fff620..5d41dae1dbc3861f24152719abd03b86707050e0 100644 --- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/attributes/RemoveFixedAttributeNode.java +++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/attributes/RemoveFixedAttributeNode.java @@ -64,10 +64,8 @@ public abstract class RemoveFixedAttributeNode extends FixedAttributeAccessNode assumptions = {"shape.getValidAssumption()"}) protected void removeAttrCached(DynamicObject attrs, @Cached("lookupShape(attrs)") Shape shape, - @Cached("lookupProperty(shape, name)") Property property, - @Cached("create()") BranchProfile notNullProfile) { + @Cached("lookupProperty(shape, name)") Property property) { if (property != null) { - notNullProfile.enter(); Shape newShape = attrs.getShape().removeProperty(property); attrs.setShapeAndResize(shape, newShape); }