harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sjanu...@apache.org
Subject svn commit: r641348 - /harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/BcBands.java
Date Wed, 26 Mar 2008 15:22:23 GMT
Author: sjanuary
Date: Wed Mar 26 08:22:18 2008
New Revision: 641348

URL: http://svn.apache.org/viewvc?rev=641348&view=rev
Log:
Apply patch for HARMONY-5652 ([classlib][pack200] max_locals computed incorrectly for longs,
doubles)

Modified:
    harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/BcBands.java

Modified: harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/BcBands.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/BcBands.java?rev=641348&r1=641347&r2=641348&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/BcBands.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/BcBands.java
Wed Mar 26 08:22:18 2008
@@ -377,7 +377,8 @@
                     int maxLocal = codeMaxNALocals[i];
                     if (!staticModifier.matches(methodFlag))
                         maxLocal++; // one for 'this' parameter
-                    maxLocal += SegmentUtils.countArgs(methodDescr[c][m]);
+                    // I believe this has to take wide arguments into account
+                    maxLocal += SegmentUtils.countInvokeInterfaceArgs(methodDescr[c][m]);
                     operandManager.setCurrentClass(segment.getClassBands()
                             .getClassThis()[c]);
                     operandManager.setSuperClass(segment.getClassBands()



Mime
View raw message