commit 43a6f6268044d1f2b20d762cc5ffda3779356ed7
author Yohann Roussel <yroussel@google.com> Wed Mar 09 10:28:51 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 09 10:28:51 2016 +0000
tree 8814cf6400d1ed4173becd31d197273174c02dae
parent 1bc626172c753c4734186bc5d363a4145989212d
parent cd70fc85ad5be28565f7697fbae0bdee52c42b0f

Merge "Fix method id merging" into ub-jack

jack/src/com/android/jack/frontend/MethodIdMerger.java

diff --git a/jack/src/com/android/jack/frontend/MethodIdMerger.java b/jack/src/com/android/jack/frontend/MethodIdMerger.java
index 435e89d..bfce4fb 100644
--- a/jack/src/com/android/jack/frontend/MethodIdMerger.java
+++ b/jack/src/com/android/jack/frontend/MethodIdMerger.java
@@ -169,12 +169,12 @@
         return;
       }
 
-      for (JMethodId id : duplicate.getMethodIds()) {
-        JMethodId keptId = keep.getMethodId(id.getType());
+      for (JMethodId duplicateId : duplicate.getMethodIds()) {
+        JMethodId keptId = keep.getMethodId(duplicateId.getType());
         if (keptId == null) {
-          keptId = new JMethodId(keep, id.getType());
+          keptId = new JMethodId(keep, duplicateId.getType());
         }
-        for (JMethod method : duplicate.getMethods()) {
+        for (JMethod method : duplicateId.getMethods()) {
           method.setMethodId(keptId);
         }
       }

jack/src/com/android/jack/ir/ast/JMethod.java

diff --git a/jack/src/com/android/jack/ir/ast/JMethod.java b/jack/src/com/android/jack/ir/ast/JMethod.java
index 3762515..d86bca9 100644
--- a/jack/src/com/android/jack/ir/ast/JMethod.java
+++ b/jack/src/com/android/jack/ir/ast/JMethod.java
@@ -398,6 +398,7 @@
 
   public void setMethodId(@Nonnull JMethodId methodId) {
     assert getExpectedMethodKind() == methodId.getMethodIdWide().getKind();
+    assert methodId.getType().equals(this.methodId.getType());
     this.methodId = methodId;
     methodId.addMethod(this);
   }