# HG changeset patch
# User Christian Humer <christian.humer@gmail.com>
# Date 1363867987 -3600
# Node ID 182753fdaa7f02b199bea5a2eecd5339a5c8f404
# Parent  fbf25ec7aa5e9791384a2265f202fac49a1410d1# Parent  ba659864f9353bd2c9b4ab196703c83a609d3c24
Merge.

diff -r ba659864f935 -r 182753fdaa7f graal/com.oracle.truffle.api.codegen.test/src/com/oracle/truffle/api/codegen/test/RuntimeStringTest.java
--- a/graal/com.oracle.truffle.api.codegen.test/src/com/oracle/truffle/api/codegen/test/RuntimeStringTest.java	Thu Mar 21 11:09:19 2013 +0100
+++ b/graal/com.oracle.truffle.api.codegen.test/src/com/oracle/truffle/api/codegen/test/RuntimeStringTest.java	Thu Mar 21 13:13:07 2013 +0100
@@ -33,17 +33,17 @@
 
     @Test
     public void testSubstr() {
-        assertExecute(new RuntimeString("es"), "substr", new RuntimeString("test"), 1, 3);
+        executeAndAssert(new RuntimeString("es"), "substr", new RuntimeString("test"), 1, 3);
     }
 
     @Test
     public void testConcat() {
-        assertExecute(new RuntimeString("concatconcat"), "concat", new RuntimeString("concat"), new RuntimeString("concat"));
+        executeAndAssert(new RuntimeString("concatconcat"), "concat", new RuntimeString("concat"), new RuntimeString("concat"));
     }
 
     @Test(expected = ArrayIndexOutOfBoundsException.class)
     public void testConcatFail() {
-        assertExecute(new RuntimeString("concatconcat"), "concat", new RuntimeString("concat"));
+        executeAndAssert(new RuntimeString("concatconcat"), "concat", new RuntimeString("concat"));
     }
 
     @Test
@@ -51,7 +51,7 @@
         // TODO
     }
 
-    private static void assertExecute(Object expectedResult, String name, Object... argumentsArray) {
+    private static void executeAndAssert(Object expectedResult, String name, Object... argumentsArray) {
         ArgNode[] args = new ArgNode[argumentsArray.length];
         for (int i = 0; i < args.length; i++) {
             args[i] = new ArgNode(argumentsArray, i);
diff -r ba659864f935 -r 182753fdaa7f graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/ast/CodeExecutableElement.java
--- a/graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/ast/CodeExecutableElement.java	Thu Mar 21 11:09:19 2013 +0100
+++ b/graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/ast/CodeExecutableElement.java	Thu Mar 21 13:13:07 2013 +0100
@@ -221,6 +221,7 @@
             copy.add(element);
         }
         copy.getModifiers().addAll(method.getModifiers());
+        copy.setVarArgs(method.isVarArgs());
         return copy;
     }