# HG changeset patch
# User Stefan Anzinger <stefan.anzinger@oracle.com>
# Date 1411753279 25200
# Node ID 45c8f71196ecc09c70d293c1301fb146a0730f8a
# Parent  c990248e816ee1fcc712966a701cff8a405a32dd# Parent  fd0f5f9abb7970b811eb8888044246858fea1ed4
Merge

diff -r fd0f5f9abb79 -r 45c8f71196ec graal/com.oracle.graal.compiler.sparc.test/src/com/oracle/graal/compiler/sparc/test/SPARCAllocatorTest.java
--- a/graal/com.oracle.graal.compiler.sparc.test/src/com/oracle/graal/compiler/sparc/test/SPARCAllocatorTest.java	Fri Sep 26 18:11:18 2014 +0200
+++ b/graal/com.oracle.graal.compiler.sparc.test/src/com/oracle/graal/compiler/sparc/test/SPARCAllocatorTest.java	Fri Sep 26 10:41:19 2014 -0700
@@ -46,7 +46,7 @@
 
     @Test
     public void test2() {
-        test("test2snippet", 1, 0, 0);
+        test("test2snippet", 2, 0, 0);
     }
 
     public static long test2snippet(long x) {
@@ -55,7 +55,7 @@
 
     @Test
     public void test3() {
-        test("test3snippet", 3, 0, 0);
+        test("test3snippet", 3, 1, 0);
     }
 
     public static long test3snippet(long x) {
diff -r fd0f5f9abb79 -r 45c8f71196ec graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/EdgesSubstitutions.java