commit 44f8d29186f121a73df3c63589c6de873e1456eb
author rjrjr@google.com <rjrjr@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Tue Oct 20 23:00:30 2009 +0000
committer rjrjr@google.com <rjrjr@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Tue Oct 20 23:00:30 2009 +0000
tree 32cd0a1c238c47bc079ed9751f6db301a70db012
parent 830c5a99080f90c6f38249cc61fd81b31f87bcb2

Bugfix when rewriting static calls with JMultiExpr qualifiers

http://gwt-code-reviews.appspot.com/78818

Patch by bobv@google.com
Review by scottb@google.com

git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@6429 8db76d5a-ed1c-0410-87a9-c151d255dfc7

dev/core/src/com/google/gwt/dev/jjs/impl/MakeCallsStatic.java

diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/MakeCallsStatic.java b/dev/core/src/com/google/gwt/dev/jjs/impl/MakeCallsStatic.java
index 7a7f6b8..1fe417a 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/MakeCallsStatic.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/MakeCallsStatic.java
@@ -19,6 +19,7 @@
 import com.google.gwt.dev.jjs.ast.Context;
 import com.google.gwt.dev.jjs.ast.JAbstractMethodBody;
 import com.google.gwt.dev.jjs.ast.JClassType;
+import com.google.gwt.dev.jjs.ast.JExpression;
 import com.google.gwt.dev.jjs.ast.JMethod;
 import com.google.gwt.dev.jjs.ast.JMethodBody;
 import com.google.gwt.dev.jjs.ast.JMethodCall;
@@ -31,6 +32,7 @@
 import com.google.gwt.dev.jjs.ast.JThisRef;
 import com.google.gwt.dev.jjs.ast.JType;
 import com.google.gwt.dev.jjs.ast.JVisitor;
+import com.google.gwt.dev.jjs.ast.js.JMultiExpression;
 import com.google.gwt.dev.jjs.ast.js.JsniMethodBody;
 import com.google.gwt.dev.js.ast.JsContext;
 import com.google.gwt.dev.js.ast.JsExpression;
@@ -320,15 +322,31 @@
     return new MakeCallsStatic(program).execImpl();
   }
 
-  static JMethodCall makeStaticCall(JMethodCall x, JMethod newMethod) {
+  static JExpression makeStaticCall(JMethodCall x, JMethod newMethod) {
     // Update the call site
     JMethodCall newCall = new JMethodCall(x.getSourceInfo().makeChild(
         MakeCallsStatic.class, "Devirtualized function call"), null, newMethod);
 
-    // The qualifier becomes the first arg
-    newCall.addArg(x.getInstance());
-    newCall.addArgs(x.getArgs());
-    return newCall;
+    /*
+     * If the qualifier is a JMultiExpression, invoke on the last value. This
+     * ensures that clinits maintain the same execution order relative to
+     * parameters in deeply-inlined scenarios.
+     */
+    // (a, b).foo() --> (a, foo(b))
+    if (x.getInstance() instanceof JMultiExpression) {
+      JMultiExpression multi = (JMultiExpression) x.getInstance();
+      int lastIndex = multi.exprs.size() - 1;
+      newCall.addArg(multi.exprs.get(lastIndex));
+      newCall.addArgs(x.getArgs());
+      multi.exprs.set(lastIndex, newCall);
+      return multi;
+    } else {
+      // The qualifier becomes the first arg
+      // a.foo(b) --> foo(a,b)
+      newCall.addArg(x.getInstance());
+      newCall.addArgs(x.getArgs());
+      return newCall;
+    }
   }
 
   protected Set<JMethod> toBeMadeStatic = new HashSet<JMethod>();