Mercurial > hg > truffle
changeset 17036:7b45e33b7986
Truffle: made TruffleRuntime#getCallTargets return a Collection and simplified its implementation.
author | Christian Humer <christian.humer@gmail.com> |
---|---|
date | Wed, 03 Sep 2014 14:58:53 +0200 |
parents | 7b2e6171f455 |
children | ff0ec169843b |
files | graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotTruffleRuntime.java graal/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/TruffleRuntimeTest.java graal/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleRuntime.java graal/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultTruffleRuntime.java |
diffstat | 4 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotTruffleRuntime.java Wed Sep 03 12:01:14 2014 +0200 +++ b/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotTruffleRuntime.java Wed Sep 03 14:58:53 2014 +0200 @@ -377,8 +377,8 @@ } @Override - public List<RootCallTarget> getCallTargets() { - return new ArrayList<>(callTargets.keySet()); + public Collection<RootCallTarget> getCallTargets() { + return Collections.unmodifiableSet(callTargets.keySet()); } public void notifyTransferToInterpreter() {
--- a/graal/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/TruffleRuntimeTest.java Wed Sep 03 12:01:14 2014 +0200 +++ b/graal/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/TruffleRuntimeTest.java Wed Sep 03 14:58:53 2014 +0200 @@ -86,7 +86,7 @@ public void testGetCallTargets1() { RootNode rootNode = createTestRootNode(); RootCallTarget target = runtime.createCallTarget(rootNode); - assertTrue(runtime.getCallTargets().indexOf(target) != -1); + assertTrue(runtime.getCallTargets().contains(target)); } @Test @@ -94,8 +94,8 @@ RootNode rootNode = createTestRootNode(); RootCallTarget target1 = runtime.createCallTarget(rootNode); RootCallTarget target2 = runtime.createCallTarget(rootNode); - assertTrue(runtime.getCallTargets().indexOf(target1) != -1); - assertTrue(runtime.getCallTargets().indexOf(target2) != -1); + assertTrue(runtime.getCallTargets().contains(target1)); + assertTrue(runtime.getCallTargets().contains(target2)); } /*
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleRuntime.java Wed Sep 03 12:01:14 2014 +0200 +++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/TruffleRuntime.java Wed Sep 03 14:58:53 2014 +0200 @@ -142,7 +142,7 @@ * Returns a list of all still referenced {@link RootCallTarget} instances that were created * using {@link #createCallTarget(RootNode)}. */ - List<RootCallTarget> getCallTargets(); + Collection<RootCallTarget> getCallTargets(); /** * Internal API method. Do not use.
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultTruffleRuntime.java Wed Sep 03 12:01:14 2014 +0200 +++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultTruffleRuntime.java Wed Sep 03 14:58:53 2014 +0200 @@ -135,8 +135,8 @@ } @Override - public List<RootCallTarget> getCallTargets() { - return new ArrayList<>(callTargets.keySet()); + public Collection<RootCallTarget> getCallTargets() { + return Collections.unmodifiableSet(callTargets.keySet()); } @Override