[jboss-cvs] javassist/src/main/javassist/expr ...

[Shigeru Chiba]

  User: chiba   
  Date: 08/03/11 06:42:47

  Modified:    src/main/javassist/expr  NewExpr.java
  Log:
  fixed JASSIST-51
  
  Revision  Changes    Path
  1.21      +4 -2      javassist/src/main/javassist/expr/NewExpr.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: NewExpr.java
  ===================================================================
  RCS file: /cvsroot/jboss/javassist/src/main/javassist/expr/NewExpr.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -b -r1.20 -r1.21
  --- NewExpr.java	20 Jan 2008 13:33:51 -0000	1.20
  +++ NewExpr.java	11 Mar 2008 10:42:47 -0000	1.21
  @@ -168,7 +168,8 @@
   
           /* delete the preceding NEW and DUP (or DUP_X1, SWAP) instructions.
            */
  -        int end = pos + canReplace();
  +        int codeSize = canReplace();
  +        int end = pos + codeSize;
           for (int i = pos; i < end; ++i)
               iterator.writeByte(NOP, i);
   
  @@ -203,6 +204,7 @@
               bytecode.addStore(retVar, newType);     // initialize $_
   
               jc.compileStmnt(statement);
  +            if (codeSize > 3)   // if the original code includes DUP.
               bytecode.addAload(retVar);
   
               replace0(pos, bytecode, bytecodeSize);