harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sjanu...@apache.org
Subject svn commit: r775090 - /harmony/enhanced/classlib/trunk/modules/pack200/src/main/java/org/apache/harmony/pack200/BcBands.java
Date Fri, 15 May 2009 11:47:35 GMT
Author: sjanuary
Date: Fri May 15 11:47:35 2009
New Revision: 775090

URL: http://svn.apache.org/viewvc?rev=775090&view=rev
Log:
Pack200 - quick fix for failing test

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=775090&r1=775089&r2=775090&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
Fri May 15 11:47:35 2009
@@ -369,21 +369,21 @@
                 opcode += 24; // change to invokevirtual_this,
                 // invokespecial_this etc.
 
-                if(name.equals("<init>") && opcode == 207) {
-                    opcode = 230; // invokespecial_this_init
-                    bcInitRef.add(cpBands.getCPMethod(owner, name, desc));
-                } else {
+//                if(name.equals("<init>") && opcode == 207) {
+//                    opcode = 230; // invokespecial_this_init
+//                    bcInitRef.add(cpBands.getCPMethod(owner, name, desc));
+//                } else {
                     bcThisMethod.add(cpBands.getCPMethod(owner, name, desc));
-                }
+//                }
             } else if (owner.equals(superClass)) { // TODO
                 opcode += 38; // change to invokevirtual_super,
                 // invokespecial_super etc.
-                if(name.equals("<init>") && opcode == 221) {
-                    opcode = 231; // invokespecial_super_init
-                    bcInitRef.add(cpBands.getCPMethod(owner, name, desc));
-                } else {
+//                if(name.equals("<init>") && opcode == 221) {
+//                    opcode = 231; // invokespecial_super_init
+//                    bcInitRef.add(cpBands.getCPMethod(owner, name, desc));
+//                } else {
                     bcSuperMethod.add(cpBands.getCPMethod(owner, name, desc));
-                }
+//                }
             } else {
                 if (aload_0) {
                     opcode -= 7;
@@ -392,12 +392,12 @@
                     // special rewrite in this
                     // case.
                 }
-                if(name.equals("<init>") && opcode == 183 && owner.equals(currentNewClass))
{
-                    opcode = 232; // invokespecial_new_init
-                    bcInitRef.add(cpBands.getCPMethod(owner, name, desc));
-                } else {
+//                if(name.equals("<init>") && opcode == 183 && owner.equals(currentNewClass))
{
+//                    opcode = 232; // invokespecial_new_init
+//                    bcInitRef.add(cpBands.getCPMethod(owner, name, desc));
+//                } else {
                     bcMethodRef.add(cpBands.getCPMethod(owner, name, desc));
-                }
+//                }
             }
             bcCodes.add(opcode);
             break;



Mime
View raw message