Author: ggregory
Date: Wed Jun 1 04:46:44 2016
New Revision: 1746383
URL: http://svn.apache.org/viewvc?rev=1746383&view=rev
Log:
[BCEL-271] FCONST pattern does not include FCONST_2.
Modified:
commons/proper/bcel/trunk/src/changes/changes.xml
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/InstructionFinder.java
Modified: commons/proper/bcel/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/changes/changes.xml?rev=1746383&r1=1746382&r2=1746383&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/changes/changes.xml (original)
+++ commons/proper/bcel/trunk/src/changes/changes.xml Wed Jun 1 04:46:44 2016
@@ -63,6 +63,7 @@ The <action> type attribute can be add,u
<body>
<release version="6.0" date="TBA" description="Major release with Java 7
and 8 support">
+ <action issue="BCEL-271" type="fix">FCONST pattern does not include
FCONST_2</action>
<action issue="BCEL-264" type="fix">Add missing Node.accept()
implementations (ConstantMethodHandle, ConstantMethodType,
ParameterAnnotationEntry)</action>
<action issue="BCEL-221" type="fix">BCELifier is not working for
Java8Example (incomplete)</action>
<action issue="BCEL-195" type="fix">addition of hashCode() to
generic/Instruction.java breaks Targeters. Never make distinct
BranchInstructions compare equal</action>
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/InstructionFinder.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/InstructionFinder.java?rev=1746383&r1=1746382&r2=1746383&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/InstructionFinder.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/InstructionFinder.java
Wed Jun 1 04:46:44 2016
@@ -346,7 +346,7 @@ public class InstructionFinder {
map.put("iconst", precompile(Const.ICONST_0, Const.ICONST_5,
Const.ICONST_M1));
map.put("lconst", new String(new char[] { '(',
makeChar(Const.LCONST_0), '|', makeChar(Const.LCONST_1), ')' }));
map.put("dconst", new String(new char[] { '(',
makeChar(Const.DCONST_0), '|', makeChar(Const.DCONST_1), ')' }));
- map.put("fconst", new String(new char[] { '(',
makeChar(Const.FCONST_0), '|', makeChar(Const.FCONST_1), ')' }));
+ map.put("fconst", new String(new char[] { '(',
makeChar(Const.FCONST_0), '|', makeChar(Const.FCONST_1), '|',
makeChar(Const.FCONST_2), ')' }));
map.put("lload", precompile(Const.LLOAD_0, Const.LLOAD_3,
Const.LLOAD));
map.put("iload", precompile(Const.ILOAD_0, Const.ILOAD_3,
Const.ILOAD));
map.put("dload", precompile(Const.DLOAD_0, Const.DLOAD_3,
Const.DLOAD));