commit e8f5b536da8a9dd165ee55f4bd6960e982805392
author Benoit Lamarche <benoitlamarche@google.com> Tue Sep 09 16:55:21 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 09 16:55:22 2014 +0000
tree b7dd71de5710a391ad2e6c53ee2198e10b313354
parent d8ede61283a8641f48fa4ba977086bf2bca58d34
parent 8a5d5ccc26c97d555024c36f54140f07a4b40b8c

Merge "Fixes command line too long error on Windows" into lmp-dev

dx/src/com/android/dx/cf/code/RopperMachine.java

diff --git a/dx/src/com/android/dx/cf/code/RopperMachine.java b/dx/src/com/android/dx/cf/code/RopperMachine.java
index ea7d6ff..530295b 100644
--- a/dx/src/com/android/dx/cf/code/RopperMachine.java
+++ b/dx/src/com/android/dx/cf/code/RopperMachine.java
@@ -940,7 +940,7 @@
                 // NOTE: This is a slow O(n) loop, and can be replaced with a
                 // faster implementation (at the cost of higher memory usage)
                 // if it proves to be a hot area of code.
-                if (ref.getDefiningClass() == method.getDefiningClass()) {
+                if (ref.getDefiningClass().equals(method.getDefiningClass())) {
                     for (int i = 0; i < methods.size(); ++i) {
                         final Method m = methods.get(i);
                         if (AccessFlags.isPrivate(m.getAccessFlags()) &&
@@ -960,7 +960,7 @@
                  */
                 CstMethodRef ref = (CstMethodRef) cst;
                 if (ref.isInstanceInit() ||
-                    (ref.getDefiningClass() == method.getDefiningClass()) ||
+                    (ref.getDefiningClass().equals(method.getDefiningClass())) ||
                     !method.getAccSuper()) {
                     return RegOps.INVOKE_DIRECT;
                 }