Mercurial > hg > graal-jvmci-8

changeset 8427:18e2856d1993

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Christian Humer <christian.humer@gmail.com>
date Thu, 21 Mar 2013 13:20:32 +0100
parents 182753fdaa7f (diff) 1571adaf302b (current diff)
children 467b41309cda
files graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ClassSubstitution.java
diffstat 2 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.truffle.api.codegen.test/src/com/oracle/truffle/api/codegen/test/RuntimeStringTest.java	Thu Mar 21 12:30:44 2013 +0100
+++ b/graal/com.oracle.truffle.api.codegen.test/src/com/oracle/truffle/api/codegen/test/RuntimeStringTest.java	Thu Mar 21 13:20:32 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);
--- a/graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/ast/CodeExecutableElement.java	Thu Mar 21 12:30:44 2013 +0100
+++ b/graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/ast/CodeExecutableElement.java	Thu Mar 21 13:20:32 2013 +0100
@@ -221,6 +221,7 @@
             copy.add(element);
         }
         copy.getModifiers().addAll(method.getModifiers());
+        copy.setVarArgs(method.isVarArgs());
         return copy;
     }