[commons-bcel] branch master updated: InstructionConstants.ALOAD_0 value is wrong (regression from 6.6.0)

[ggregory]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-bcel.git


The following commit(s) were added to refs/heads/master by this push:
     new 0473a82c InstructionConstants.ALOAD_0 value is wrong (regression from 
6.6.0)
0473a82c is described below

commit 0473a82c42164dad8259afca8a87f89bdf4a9ee2
Author: Gary David Gregory (Code signing key) <ggreg...@apache.org>
AuthorDate: Wed Nov 16 00:15:41 2022 -0500

    InstructionConstants.ALOAD_0 value is wrong (regression from 6.6.0)
    
    InstructionConstants.DCONST_0 value is wrong (regression from 6.6.0).
---
 src/changes/changes.xml                                         | 2 ++
 src/main/java/org/apache/bcel/generic/InstructionConstants.java | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 72f8b4e3..966f0887 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -80,6 +80,8 @@ The <action> type attribute can be add,update,fix,remove.
       <action                  type="fix" dev="ggregory" due-to="Gary 
Gregory">org.apache.bcel.classfile.Synthetic constructors now throw 
ClassFormatException on invalid length input.</action>
       <action                  type="fix" dev="ggregory" due-to="Gary 
Gregory">org.apache.bcel.classfile.Signature constructors now throw 
ClassFormatException on invalid length input.</action>
       <action                  type="fix" dev="ggregory" due-to="Gary 
Gregory">org.apache.bcel.classfile.SourceFile constructors now throw 
ClassFormatException on invalid input.</action>
+      <action                  type="fix" dev="ggregory" due-to="Gary 
Gregory">InstructionConstants.ALOAD_0 value is wrong (regression from 
6.6.0).</action>
+      <action                  type="fix" dev="ggregory" due-to="Gary 
Gregory">InstructionConstants.DCONST_0 value is wrong (regression from 
6.6.0).</action>
       <!-- UPDATE -->
       <action                  type="update" dev="ggregory" due-to="Gary 
Gregory">Bump spotbugs-maven-plugin from 4.7.2.2 to 4.7.3.0 #167.</action>
     </release>
diff --git a/src/main/java/org/apache/bcel/generic/InstructionConstants.java 
b/src/main/java/org/apache/bcel/generic/InstructionConstants.java
index 067556f7..56d3dee6 100644
--- a/src/main/java/org/apache/bcel/generic/InstructionConstants.java
+++ b/src/main/java/org/apache/bcel/generic/InstructionConstants.java
@@ -56,7 +56,7 @@ public interface InstructionConstants {
     Instruction FCONST_0 = InstructionConst.FCONST_0;
     Instruction FCONST_1 = InstructionConst.FCONST_1;
     Instruction FCONST_2 = InstructionConst.FCONST_2;
-    Instruction DCONST_0 = InstructionConst.FCONST_2;
+    Instruction DCONST_0 = InstructionConst.DCONST_0;
     Instruction DCONST_1 = InstructionConst.DCONST_1;
     ArrayInstruction IALOAD = InstructionConst.IALOAD;
     ArrayInstruction LALOAD = InstructionConst.LALOAD;
@@ -155,7 +155,7 @@ public interface InstructionConstants {
      * values, e.g. call setIndex().
      */
     LocalVariableInstruction THIS = InstructionConst.THIS;
-    LocalVariableInstruction ALOAD_0 = THIS;
+    LocalVariableInstruction ALOAD_0 = InstructionConst.ALOAD_0;
     LocalVariableInstruction ALOAD_1 = InstructionConst.ALOAD_1;
     LocalVariableInstruction ALOAD_2 = InstructionConst.ALOAD_2;
     LocalVariableInstruction ILOAD_0 = InstructionConst.ILOAD_0;