# HG changeset patch # User Christian Humer # Date 1378496270 -7200 # Node ID 91dbb0b7dc8b8a381ef725006f8997f7f9a8eb51 # Parent 2391d44f9d2c430097641fc6ebe1323520cfa6c1# Parent e122183381640f349f59027a3606e0ff7c74a075 Merge. diff -r 2391d44f9d2c -r 91dbb0b7dc8b graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HotSpotReplacementsUtil.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HotSpotReplacementsUtil.java Fri Sep 06 17:59:27 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HotSpotReplacementsUtil.java Fri Sep 06 21:37:50 2013 +0200 @@ -167,7 +167,7 @@ */ public static boolean clearPendingException(Word thread) { boolean result = thread.readObject(threadPendingExceptionOffset(), PENDING_EXCEPTION_LOCATION) != null; - thread.writeObject(threadPendingExceptionOffset(), null); + thread.writeObject(threadPendingExceptionOffset(), null, PENDING_EXCEPTION_LOCATION); return result; } @@ -178,7 +178,7 @@ */ public static Object getAndClearObjectResult(Word thread) { Object result = thread.readObject(objectResultOffset(), OBJECT_RESULT_LOCATION); - thread.writeObject(objectResultOffset(), null); + thread.writeObject(objectResultOffset(), null, OBJECT_RESULT_LOCATION); return result; } diff -r 2391d44f9d2c -r 91dbb0b7dc8b graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/SnippetTemplate.java --- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/SnippetTemplate.java Fri Sep 06 17:59:27 2013 +0200 +++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/SnippetTemplate.java Fri Sep 06 21:37:50 2013 +0200 @@ -528,8 +528,6 @@ ReturnNode retNode = null; StartNode entryPointNode = snippet.start(); - new DeadCodeEliminationPhase().apply(snippetCopy); - nodes = new ArrayList<>(snippet.getNodeCount()); for (Node node : snippet.getNodes()) { if (node == entryPointNode || node == entryPointNode.stateAfter()) {