Merge "Fix bad instruction massaging"

aosp-mirror · Feb 13, 2017 · e5a2644 · e5a2644
2 parents 2775aa3 + 0e44f19
commit e5a2644
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/dx/src/com/android/dx/rop/code/RegisterSpecList.java b/dx/src/com/android/dx/rop/code/RegisterSpecList.java
@@ -417,11 +417,13 @@ private void expandRegister(int regIdx, RegisterSpec registerToExpand) {
           if (!duplicateFirst) {
             base += expandedReg.getCategory();
           }
-          duplicateFirst = false;
         } else {
           expandedReg = registerToExpand;
         }
 
+        // Reset duplicateFirst when the first register has been dealt with.
+        duplicateFirst = false;
+
         result.set0(regIdx, expandedReg);
       }