# HG changeset patch # User Christian Humer # Date 1409749133 -7200 # Node ID 7b45e33b79861e34e5e08abb67f61e0b0171d18b # Parent 7b2e6171f455f83222d40c5584a1b6655a32faf9 Truffle: made TruffleRuntime#getCallTargets return a Collection and simplified its implementation. diff -r 7b2e6171f455 -r 7b45e33b7986 graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotTruffleRuntime.java --- 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 getCallTargets() { - return new ArrayList<>(callTargets.keySet()); + public Collection getCallTargets() { + return Collections.unmodifiableSet(callTargets.keySet()); } public void notifyTransferToInterpreter() { diff -r 7b2e6171f455 -r 7b45e33b7986 graal/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/TruffleRuntimeTest.java --- 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)); } /* diff -r 7b2e6171f455 -r 7b45e33b7986 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 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 getCallTargets(); + Collection getCallTargets(); /** * Internal API method. Do not use. diff -r 7b2e6171f455 -r 7b45e33b7986 graal/com.oracle.truffle.api/src/com/oracle/truffle/api/impl/DefaultTruffleRuntime.java --- 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 getCallTargets() { - return new ArrayList<>(callTargets.keySet()); + public Collection getCallTargets() { + return Collections.unmodifiableSet(callTargets.keySet()); } @Override