# HG changeset patch # User Thomas Wuerthinger # Date 1366724046 -7200 # Node ID 07f8d136a05e7dbbb07e49f8183ac1251ce22390 # Parent 542712a4732ab3ee675b4962e948cb11e3801cc9 Truffle API changes for the Frame API. Introduction of Assumptions class. diff -r 542712a4732a -r 07f8d136a05e graal/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/FrameSlotTypeSpecializationTest.java --- a/graal/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/FrameSlotTypeSpecializationTest.java Tue Apr 23 15:08:11 2013 +0200 +++ b/graal/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/FrameSlotTypeSpecializationTest.java Tue Apr 23 15:34:06 2013 +0200 @@ -34,12 +34,7 @@ *

* Dynamically typed languages can speculate on the type of a frame slot and only fall back at run * time to a more generic type if necessary. The new type of a frame slot can be set using the - * {@link FrameSlot#setType(Class)} method. It is the responsibility of the language implementor to - * update the content of currently active frames (using {@link Frame#updateToLatestVersion()}). - * Also, nodes that depend a specific type of a frame slot must be replaced. Such node can register - * a listener that implements {@link FrameSlotTypeListener} using - * {@link FrameSlot#registerOneShotTypeListener(FrameSlotTypeListener)}. The event of a type change - * on the frame slot will fire only once for the next upcoming change. + * {@link FrameSlot#setType(Class)} method. *

* *

@@ -53,10 +48,10 @@ public void test() { TruffleRuntime runtime = Truffle.getRuntime(); FrameDescriptor frameDescriptor = new FrameDescriptor(); - FrameSlot slot = frameDescriptor.addFrameSlot("localVar", Integer.class); + FrameSlot slot = frameDescriptor.addFrameSlot("localVar", int.class); TestRootNode rootNode = new TestRootNode(new IntAssignLocal(slot, new StringTestChildNode()), new IntReadLocal(slot)); CallTarget target = runtime.createCallTarget(rootNode, frameDescriptor); - Assert.assertEquals(Integer.class, slot.getType()); + Assert.assertEquals(int.class, slot.getType()); Object result = target.call(); Assert.assertEquals("42", result); Assert.assertEquals(Object.class, slot.getType()); @@ -102,35 +97,29 @@ } - class IntAssignLocal extends FrameSlotNode implements FrameSlotTypeListener { + class IntAssignLocal extends FrameSlotNode { @Child private TestChildNode value; IntAssignLocal(FrameSlot slot, TestChildNode value) { super(slot); this.value = adoptChild(value); - slot.registerOneShotTypeListener(this); } @Override Object execute(VirtualFrame frame) { Object o = value.execute(frame); if (o instanceof Integer) { - frame.setInt(slot, (Integer) o); - } else { - slot.setType(Object.class); - frame.updateToLatestVersion(); - frame.setObject(slot, o); + try { + frame.setInt(slot, (Integer) o); + } catch (FrameSlotTypeException e) { + // fall through + } } + FrameUtil.setObjectSafe(frame, slot, o); + this.replace(new ObjectAssignLocal(slot, value)); return null; } - - @Override - public void typeChanged(FrameSlot changedSlot, Class oldType) { - if (changedSlot.getType() == Object.class) { - this.replace(new ObjectAssignLocal(changedSlot, value)); - } - } } class ObjectAssignLocal extends FrameSlotNode { @@ -145,27 +134,27 @@ @Override Object execute(VirtualFrame frame) { Object o = value.execute(frame); - frame.setObject(slot, o); + try { + frame.setObject(slot, o); + } catch (FrameSlotTypeException e) { + FrameUtil.setObjectSafe(frame, slot, o); + } return null; } } - class IntReadLocal extends FrameSlotNode implements FrameSlotTypeListener { + class IntReadLocal extends FrameSlotNode { IntReadLocal(FrameSlot slot) { super(slot); - slot.registerOneShotTypeListener(this); } @Override Object execute(VirtualFrame frame) { - return frame.getInt(slot); - } - - @Override - public void typeChanged(FrameSlot changedSlot, Class oldType) { - if (changedSlot.getType() == Object.class) { - this.replace(new ObjectReadLocal(changedSlot)); + try { + return frame.getInt(slot); + } catch (FrameSlotTypeException e) { + return this.replace(new ObjectReadLocal(slot)).execute(frame); } } } @@ -178,7 +167,11 @@ @Override Object execute(VirtualFrame frame) { - return frame.getObject(slot); + try { + return frame.getObject(slot); + } catch (FrameSlotTypeException e) { + throw new IllegalStateException(e); + } } } } diff -r 542712a4732a -r 07f8d136a05e graal/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/FrameTest.java --- a/graal/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/FrameTest.java Tue Apr 23 15:08:11 2013 +0200 +++ b/graal/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/FrameTest.java Tue Apr 23 15:34:06 2013 +0200 @@ -64,7 +64,7 @@ public void test() { TruffleRuntime runtime = Truffle.getRuntime(); FrameDescriptor frameDescriptor = new FrameDescriptor(); - FrameSlot slot = frameDescriptor.addFrameSlot("localVar", Integer.class); + FrameSlot slot = frameDescriptor.addFrameSlot("localVar", int.class); TestRootNode rootNode = new TestRootNode(new AssignLocal(slot), new ReadLocal(slot)); CallTarget target = runtime.createCallTarget(rootNode, frameDescriptor); Object result = target.call(); @@ -109,7 +109,11 @@ @Override int execute(VirtualFrame frame) { - frame.setInt(slot, 42); + try { + frame.setInt(slot, 42); + } catch (FrameSlotTypeException e) { + throw new IllegalStateException(e); + } return 0; } } @@ -122,7 +126,11 @@ @Override int execute(VirtualFrame frame) { - return frame.getInt(slot); + try { + return frame.getInt(slot); + } catch (FrameSlotTypeException e) { + throw new IllegalStateException(e); + } } } } diff -r 542712a4732a -r 07f8d136a05e graal/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ReturnTypeSpecializationTest.java --- a/graal/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ReturnTypeSpecializationTest.java Tue Apr 23 15:08:11 2013 +0200 +++ b/graal/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/ReturnTypeSpecializationTest.java Tue Apr 23 15:34:06 2013 +0200 @@ -47,10 +47,10 @@ public void test() { TruffleRuntime runtime = Truffle.getRuntime(); FrameDescriptor frameDescriptor = new FrameDescriptor(); - FrameSlot slot = frameDescriptor.addFrameSlot("localVar", Integer.class); + FrameSlot slot = frameDescriptor.addFrameSlot("localVar", int.class); TestRootNode rootNode = new TestRootNode(new IntAssignLocal(slot, new StringTestChildNode()), new IntReadLocal(slot)); CallTarget target = runtime.createCallTarget(rootNode, frameDescriptor); - Assert.assertEquals(Integer.class, slot.getType()); + Assert.assertEquals(int.class, slot.getType()); Object result = target.call(); Assert.assertEquals("42", result); Assert.assertEquals(Object.class, slot.getType()); @@ -104,34 +104,31 @@ } - class IntAssignLocal extends FrameSlotNode implements FrameSlotTypeListener { + class IntAssignLocal extends FrameSlotNode { @Child private TestChildNode value; IntAssignLocal(FrameSlot slot, TestChildNode value) { super(slot); this.value = adoptChild(value); - slot.registerOneShotTypeListener(this); } @Override Object execute(VirtualFrame frame) { try { - frame.setInt(slot, value.executeInt(frame)); + int result = value.executeInt(frame); + try { + frame.setInt(slot, result); + } catch (FrameSlotTypeException e) { + FrameUtil.setObjectSafe(frame, slot, result); + replace(new ObjectAssignLocal(slot, value)); + } } catch (UnexpectedResultException e) { - slot.setType(Object.class); - frame.updateToLatestVersion(); - frame.setObject(slot, e.getResult()); + FrameUtil.setObjectSafe(frame, slot, e.getResult()); + replace(new ObjectAssignLocal(slot, value)); } return null; } - - @Override - public void typeChanged(FrameSlot changedSlot, Class oldType) { - if (changedSlot.getType() == Object.class) { - this.replace(new ObjectAssignLocal(changedSlot, value)); - } - } } class ObjectAssignLocal extends FrameSlotNode { @@ -146,32 +143,36 @@ @Override Object execute(VirtualFrame frame) { Object o = value.execute(frame); - frame.setObject(slot, o); + try { + frame.setObject(slot, o); + } catch (FrameSlotTypeException e) { + FrameUtil.setObjectSafe(frame, slot, o); + } return null; } } - class IntReadLocal extends FrameSlotNode implements FrameSlotTypeListener { + class IntReadLocal extends FrameSlotNode { IntReadLocal(FrameSlot slot) { super(slot); - slot.registerOneShotTypeListener(this); } @Override Object execute(VirtualFrame frame) { - return executeInt(frame); + try { + return frame.getInt(slot); + } catch (FrameSlotTypeException e) { + return replace(new ObjectReadLocal(slot)).execute(frame); + } } @Override - int executeInt(VirtualFrame frame) { - return frame.getInt(slot); - } - - @Override - public void typeChanged(FrameSlot changedSlot, Class oldType) { - if (changedSlot.getType() == Object.class) { - this.replace(new ObjectReadLocal(changedSlot)); + int executeInt(VirtualFrame frame) throws UnexpectedResultException { + try { + return frame.getInt(slot); + } catch (FrameSlotTypeException e) { + return replace(new ObjectReadLocal(slot)).executeInt(frame); } } } @@ -184,7 +185,11 @@ @Override Object execute(VirtualFrame frame) { - return frame.getObject(slot); + try { + return frame.getObject(slot); + } catch (FrameSlotTypeException e) { + throw new IllegalStateException(e); + } } } } diff -r 542712a4732a -r 07f8d136a05e graal/com.oracle.truffle.api/src/com/oracle/truffle/api/Assumption.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/Assumption.java Tue Apr 23 15:34:06 2013 +0200 @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package com.oracle.truffle.api; + +import com.oracle.truffle.api.nodes.*; + +public interface Assumption { + + void check() throws InvalidAssumptionException; + + void invalidate(); + + String getName(); +} diff -r 542712a4732a -r 07f8d136a05e graal/com.oracle.truffle.api/src/com/oracle/truffle/api/LoopCountReceiver.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/LoopCountReceiver.java Tue Apr 23 15:34:06 2013 +0200 @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package com.oracle.truffle.api; + +public interface LoopCountReceiver { + + void reportLoopCount(int count); +} diff -r 542712a4732a -r 07f8d136a05e graal/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleRuntime.java --- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleRuntime.java Tue Apr 23 15:08:11 2013 +0200 +++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleRuntime.java Tue Apr 23 15:34:06 2013 +0200 @@ -60,6 +60,21 @@ CallTarget createCallTarget(RootNode rootNode, FrameDescriptor frameDescriptor); /** + * Creates a new assumption object that can be checked and invalidated. + * + * @return the newly created assumption object + */ + Assumption createAssumption(); + + /** + * Creates a new assumption object with a given name that can be checked and invalidated. + * + * @param name the name for the new assumption + * @return the newly created assumption object + */ + Assumption createAssumption(String name); + + /** * Creates a new materialized frame object that can be used to store values. * * @return the newly created materialized frame object diff -r 542712a4732a -r 07f8d136a05e graal/com.oracle.truffle.api/src/com/oracle/truffle/api/frame/DefaultTypeConversion.java --- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/frame/DefaultTypeConversion.java Tue Apr 23 15:08:11 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ -/* - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package com.oracle.truffle.api.frame; - -/** - * Default type conversion semantics where a conversion is without changing any data. - */ -public final class DefaultTypeConversion implements TypeConversion { - - private static DefaultTypeConversion instance = new DefaultTypeConversion(); - - public static TypeConversion getInstance() { - return instance; - } - - private DefaultTypeConversion() { - - } - - @Override - public Class getTopType() { - return Object.class; - } - - @Override - public Object convertTo(Class targetType, Object value) { - return value; - } -} diff -r 542712a4732a -r 07f8d136a05e graal/com.oracle.truffle.api/src/com/oracle/truffle/api/frame/Frame.java --- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/frame/Frame.java Tue Apr 23 15:08:11 2013 +0200 +++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/frame/Frame.java Tue Apr 23 15:34:06 2013 +0200 @@ -46,7 +46,7 @@ * @param slot the slot of the local variable * @return the current value of the local variable */ - Object getObject(FrameSlot slot); + Object getObject(FrameSlot slot) throws FrameSlotTypeException; /** * Write access to a local variable of type {@link Object}. @@ -54,7 +54,7 @@ * @param slot the slot of the local variable * @param value the new value of the local variable */ - void setObject(FrameSlot slot, Object value); + void setObject(FrameSlot slot, Object value) throws FrameSlotTypeException; /** * Read access to a local variable of type boolean. @@ -62,7 +62,7 @@ * @param slot the slot of the local variable * @return the current value of the local variable */ - boolean getBoolean(FrameSlot slot); + boolean getBoolean(FrameSlot slot) throws FrameSlotTypeException; /** * Write access to a local variable of type boolean. @@ -70,7 +70,7 @@ * @param slot the slot of the local variable * @param value the new value of the local variable */ - void setBoolean(FrameSlot slot, boolean value); + void setBoolean(FrameSlot slot, boolean value) throws FrameSlotTypeException; /** * Read access to a local variable of type int. @@ -78,7 +78,7 @@ * @param slot the slot of the local variable * @return the current value of the local variable */ - int getInt(FrameSlot slot); + int getInt(FrameSlot slot) throws FrameSlotTypeException; /** * Write access to a local variable of type int. @@ -86,7 +86,7 @@ * @param slot the slot of the local variable * @param value the new value of the local variable */ - void setInt(FrameSlot slot, int value); + void setInt(FrameSlot slot, int value) throws FrameSlotTypeException; /** * Read access to a local variable of type long. @@ -94,7 +94,7 @@ * @param slot the slot of the local variable * @return the current value of the local variable */ - long getLong(FrameSlot slot); + long getLong(FrameSlot slot) throws FrameSlotTypeException; /** * Write access to a local variable of type long. @@ -102,7 +102,7 @@ * @param slot the slot of the local variable * @param value the new value of the local variable */ - void setLong(FrameSlot slot, long value); + void setLong(FrameSlot slot, long value) throws FrameSlotTypeException; /** * Read access to a local variable of type float. @@ -110,7 +110,7 @@ * @param slot the slot of the local variable * @return the current value of the local variable */ - float getFloat(FrameSlot slot); + float getFloat(FrameSlot slot) throws FrameSlotTypeException; /** * Write access to a local variable of type float. @@ -118,7 +118,7 @@ * @param slot the slot of the local variable * @param value the new value of the local variable */ - void setFloat(FrameSlot slot, float value); + void setFloat(FrameSlot slot, float value) throws FrameSlotTypeException; /** * Read access to a local variable of type double. @@ -126,7 +126,7 @@ * @param slot the slot of the local variable * @return the current value of the local variable */ - double getDouble(FrameSlot slot); + double getDouble(FrameSlot slot) throws FrameSlotTypeException; /** * Write access to a local variable of type double. @@ -134,9 +134,15 @@ * @param slot the slot of the local variable * @param value the new value of the local variable */ - void setDouble(FrameSlot slot, double value); + void setDouble(FrameSlot slot, double value) throws FrameSlotTypeException; - void updateToLatestVersion(); + /** + * Read access to a local variable of any type. + * + * @param slot the slot of the local variable + * @return the current value of the local variable or defaultValue if unset + */ + Object getValue(FrameSlot slot); /** * Converts this virtual frame into a packed frame that has no longer direct access to the local diff -r 542712a4732a -r 07f8d136a05e graal/com.oracle.truffle.api/src/com/oracle/truffle/api/frame/FrameDescriptor.java --- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/frame/FrameDescriptor.java Tue Apr 23 15:08:11 2013 +0200 +++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/frame/FrameDescriptor.java Tue Apr 23 15:34:06 2013 +0200 @@ -24,30 +24,33 @@ import java.util.*; +import com.oracle.truffle.api.*; +import com.oracle.truffle.api.impl.*; + /** * Descriptor of the slots of frame objects. Multiple frame instances are associated with one such * descriptor. */ -public final class FrameDescriptor { +public final class FrameDescriptor implements Cloneable { - protected final TypeConversion typeConversion; + private final FrameTypeConversion typeConversion; private final ArrayList slots; - private FrameVersionImpl lastVersion; private final HashMap identifierToSlotMap; + private Assumption version; public FrameDescriptor() { - this(DefaultTypeConversion.getInstance()); + this(DefaultFrameTypeConversion.getInstance()); } - public FrameDescriptor(TypeConversion typeConversion) { + public FrameDescriptor(FrameTypeConversion typeConversion) { this.typeConversion = typeConversion; slots = new ArrayList<>(); identifierToSlotMap = new HashMap<>(); - lastVersion = new FrameVersionImpl(); + version = createVersion(); } public FrameSlot addFrameSlot(Object identifier) { - return addFrameSlot(identifier, typeConversion.getTopType()); + return addFrameSlot(identifier, null); } public FrameSlot addFrameSlot(Object identifier, Class type) { @@ -55,6 +58,7 @@ FrameSlotImpl slot = new FrameSlotImpl(this, identifier, slots.size(), type); slots.add(slot); identifierToSlotMap.put(identifier, slot); + updateVersion(); return slot; } @@ -70,8 +74,12 @@ return addFrameSlot(identifier); } - public FrameVersion getCurrentVersion() { - return lastVersion; + public FrameSlot findOrAddFrameSlot(Object identifier, Class type) { + FrameSlot result = findFrameSlot(identifier); + if (result != null) { + return result; + } + return addFrameSlot(identifier, type); } public int getSize() { @@ -82,121 +90,42 @@ return Collections.unmodifiableList(slots); } - protected void appendVersion(FrameVersionImpl newVersion) { - lastVersion.next = newVersion; - lastVersion = newVersion; - } -} - -class FrameVersionImpl implements FrameVersion { - - protected FrameVersionImpl next; - - @Override - public final FrameVersion getNext() { - return next; - } -} - -class TypeChangeFrameVersionImpl extends FrameVersionImpl implements FrameVersion.TypeChange { - - private final FrameSlotImpl slot; - private final Class oldType; - private final Class newType; - - protected TypeChangeFrameVersionImpl(FrameSlotImpl slot, Class oldType, Class newType) { - this.slot = slot; - this.oldType = oldType; - this.newType = newType; - } - - @Override - public final void applyTransformation(Frame frame) { - Object value = slot.getValue(oldType, frame); - slot.setValue(newType, frame, value); - } -} - -class FrameSlotImpl implements FrameSlot { - - private final FrameDescriptor descriptor; - private final Object identifier; - private final int index; - private Class type; - private ArrayList listeners; - - protected FrameSlotImpl(FrameDescriptor descriptor, Object identifier, int index, Class type) { - this.descriptor = descriptor; - this.identifier = identifier; - this.index = index; - this.type = type; - assert type != null; - } - - public Object getIdentifier() { - return identifier; - } - - public int getIndex() { - return index; + /** + * (db) to retrieve the list of all the identifiers associated with this frame descriptor. + * + * @return the list of all the identifiers in this frame descriptor + */ + public Set