[Fb-contrib-commit] fb-contrib/src/com/mebigfatguy/fbcontrib/detect ArrayBasedCollections.java,1.4,1
Brought to you by:
dbrosius
Menu
▾
▴
[Fb-contrib-commit] fb-contrib/src/com/mebigfatguy/fbcontrib/detect ArrayBasedCollections.java,1.4,1.5 ArrayWrappedCallByReference.java,1.3,1.4 BloatedSynchronizedBlock.java,1.13,1.14 ClassEnvy.java,1.18,1.19 CustomBuiltXML.java,1.6,1.7 DubiousListCollection.java,1.10,1.11 InefficientStringBuffering.java,1.7,1.8 ListIndexedIterating.java,1.11,1.12 LiteralStringComparison.java,1.7,1.8 OrphanedDOMNode.java,1.4,1.5 OverlyConcreteParameter.java,1.26,1.27 ParallelLists.java,1.8,1.9 PartiallyConstructedObjectAccess.java,1.5,1.6 SpuriousThreadStates.java,1.6,1.7 StaticMethodInstanceInvocation.java,1.5,1.6 SyncCollectionIterators.java,1.10,1.11 UnrelatedCollectionContents.java,1.11,1.12
Update of /cvsroot/fb-contrib/fb-contrib/src/com/mebigfatguy/fbcontrib/detect In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14252/src/com/mebigfatguy/fbcontrib/detect Modified Files: ArrayBasedCollections.java ArrayWrappedCallByReference.java BloatedSynchronizedBlock.java ClassEnvy.java CustomBuiltXML.java DubiousListCollection.java InefficientStringBuffering.java ListIndexedIterating.java LiteralStringComparison.java OrphanedDOMNode.java OverlyConcreteParameter.java ParallelLists.java PartiallyConstructedObjectAccess.java SpuriousThreadStates.java StaticMethodInstanceInvocation.java SyncCollectionIterators.java UnrelatedCollectionContents.java Log Message: use OpcodeStack.mergeJumps Index: DubiousListCollection.java =================================================================== RCS file: /cvsroot/fb-contrib/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/DubiousListCollection.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- DubiousListCollection.java 4 Jan 2006 02:40:42 -0000 1.10 +++ DubiousListCollection.java 31 Jan 2006 02:14:26 -0000 1.11 @@ -115,6 +115,8 @@ @Override public void sawOpcode(final int seen) { try { + stack.mergeJumps(this); + if (seen == INVOKEINTERFACE) { String className = this.getClassConstantOperand(); String methodName = getNameConstantOperand(); Index: BloatedSynchronizedBlock.java =================================================================== RCS file: /cvsroot/fb-contrib/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/BloatedSynchronizedBlock.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- BloatedSynchronizedBlock.java 29 Jan 2006 19:53:05 -0000 1.13 +++ BloatedSynchronizedBlock.java 31 Jan 2006 02:14:26 -0000 1.14 @@ -89,6 +89,8 @@ */ public void sawOpcode(int seen) { try { + stack.mergeJumps(this); + if (thisCallOccurred && ((seen == ASTORE) || ((seen >= ASTORE_0) && (seen <= ASTORE_3)))) { int storeReg = astoreReg(seen); if (storeReg >= 0) Index: ArrayBasedCollections.java =================================================================== RCS file: /cvsroot/fb-contrib/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/ArrayBasedCollections.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ArrayBasedCollections.java 4 Jan 2006 02:40:42 -0000 1.4 +++ ArrayBasedCollections.java 31 Jan 2006 02:14:26 -0000 1.5 @@ -109,6 +109,8 @@ @Override public void sawOpcode(int seen) { try { + stack.mergeJumps(this); + if (seen == INVOKEINTERFACE) { String className = getClassConstantOperand(); String methodName = getNameConstantOperand(); Index: ListIndexedIterating.java =================================================================== RCS file: /cvsroot/fb-contrib/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/ListIndexedIterating.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- ListIndexedIterating.java 4 Jan 2006 02:40:42 -0000 1.11 +++ ListIndexedIterating.java 31 Jan 2006 02:14:26 -0000 1.12 @@ -113,6 +113,8 @@ */ private void sawOpcodeLoop(final int seen) { try { + stack.mergeJumps(this); + switch (state) { case SEEN_NOTHING: if ((seen == IINC) && (getIntConstant() == 1)) { @@ -151,6 +153,8 @@ */ private void sawOpcodeBug(final int seen) { try { + stack.mergeJumps(this); + Iterator<ForLoop> it = possibleForLoops.iterator(); while (it.hasNext()) { ForLoop fl = it.next(); Index: UnrelatedCollectionContents.java =================================================================== RCS file: /cvsroot/fb-contrib/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/UnrelatedCollectionContents.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- UnrelatedCollectionContents.java 4 Jan 2006 02:40:42 -0000 1.11 +++ UnrelatedCollectionContents.java 31 Jan 2006 02:14:26 -0000 1.12 @@ -95,6 +95,8 @@ @Override public void sawOpcode(final int seen) { try { + stack.mergeJumps(this); + Set<Integer> regs = localScopeEnds.remove(getPC()); if (regs != null) { for (Integer i : regs) { Index: SyncCollectionIterators.java =================================================================== RCS file: /cvsroot/fb-contrib/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/SyncCollectionIterators.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- SyncCollectionIterators.java 4 Jan 2006 02:40:42 -0000 1.10 +++ SyncCollectionIterators.java 31 Jan 2006 02:14:26 -0000 1.11 @@ -102,6 +102,8 @@ @Override public void sawOpcode(final int seen) { try { + stack.mergeJumps(this); + switch (state) { case SEEN_NOTHING: if ((seen == INVOKESTATIC) && "java/util/Collections".equals(getClassConstantOperand())) { Index: CustomBuiltXML.java =================================================================== RCS file: /cvsroot/fb-contrib/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/CustomBuiltXML.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- CustomBuiltXML.java 20 Jan 2006 04:24:04 -0000 1.6 +++ CustomBuiltXML.java 31 Jan 2006 02:14:26 -0000 1.7 @@ -114,6 +114,8 @@ String strCon = null; try { + stack.mergeJumps(this); + if (seen == INVOKESPECIAL) { String clsName = getClassConstantOperand(); if ("java/lang/StringBuffer".equals(clsName) || "java/lang/StringBuilder".equals(clsName)) { Index: ClassEnvy.java =================================================================== RCS file: /cvsroot/fb-contrib/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/ClassEnvy.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- ClassEnvy.java 4 Jan 2006 02:40:42 -0000 1.18 +++ ClassEnvy.java 31 Jan 2006 02:14:26 -0000 1.19 @@ -173,6 +173,8 @@ @Override public void sawOpcode(final int seen) { try { + stack.mergeJumps(this); + if ((seen == INVOKEVIRTUAL) || (seen == INVOKEINTERFACE) || (seen == INVOKESTATIC) Index: StaticMethodInstanceInvocation.java =================================================================== RCS file: /cvsroot/fb-contrib/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/StaticMethodInstanceInvocation.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- StaticMethodInstanceInvocation.java 4 Jan 2006 02:40:42 -0000 1.5 +++ StaticMethodInstanceInvocation.java 31 Jan 2006 02:14:26 -0000 1.6 @@ -65,6 +65,8 @@ @Override public void sawOpcode(int seen) { try { + stack.mergeJumps(this); + int sDepth = stack.getStackDepth(); Iterator<PopInfo> it = popStack.iterator(); Index: ArrayWrappedCallByReference.java =================================================================== RCS file: /cvsroot/fb-contrib/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/ArrayWrappedCallByReference.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ArrayWrappedCallByReference.java 25 Jan 2006 03:26:18 -0000 1.3 +++ ArrayWrappedCallByReference.java 31 Jan 2006 02:14:26 -0000 1.4 @@ -91,6 +91,8 @@ public void sawOpcode(int seen) { Integer userValue = null; try { + stack.mergeJumps(this); + if ((seen == NEWARRAY) || (seen == ANEWARRAY)) { if (stack.getStackDepth() > 0) { OpcodeStack.Item itm = stack.getStackItem(0); Index: ParallelLists.java =================================================================== RCS file: /cvsroot/fb-contrib/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/ParallelLists.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ParallelLists.java 4 Jan 2006 02:40:42 -0000 1.8 +++ ParallelLists.java 31 Jan 2006 02:14:26 -0000 1.9 @@ -91,6 +91,8 @@ @Override public void sawOpcode(final int seen) { try { + stack.mergeJumps(this); + if (seen == INVOKEINTERFACE) { String className = getClassConstantOperand(); String methodName = getNameConstantOperand(); Index: LiteralStringComparison.java =================================================================== RCS file: /cvsroot/fb-contrib/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/LiteralStringComparison.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- LiteralStringComparison.java 4 Jan 2006 02:40:42 -0000 1.7 +++ LiteralStringComparison.java 31 Jan 2006 02:14:26 -0000 1.8 @@ -68,6 +68,8 @@ @Override public void sawOpcode(final int seen) { try { + stack.mergeJumps(this); + if ((seen == INVOKEVIRTUAL) && "java/lang/String".equals(getClassConstantOperand())) { String calledMethodName = getNameConstantOperand(); String calledMethodSig = getSigConstantOperand(); Index: OrphanedDOMNode.java =================================================================== RCS file: /cvsroot/fb-contrib/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/OrphanedDOMNode.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- OrphanedDOMNode.java 4 Jan 2006 02:40:42 -0000 1.4 +++ OrphanedDOMNode.java 31 Jan 2006 02:14:26 -0000 1.5 @@ -115,6 +115,8 @@ Integer itemPC = null; try { + stack.mergeJumps(this); + if (seen == INVOKEINTERFACE) { String className = getClassConstantOperand(); String methodInfo = getNameConstantOperand() + ":" + getSigConstantOperand(); Index: PartiallyConstructedObjectAccess.java =================================================================== RCS file: /cvsroot/fb-contrib/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/PartiallyConstructedObjectAccess.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- PartiallyConstructedObjectAccess.java 4 Jan 2006 02:40:42 -0000 1.5 +++ PartiallyConstructedObjectAccess.java 31 Jan 2006 02:14:26 -0000 1.6 @@ -76,6 +76,8 @@ return; try { + stack.mergeJumps(this); + if ((seen == INVOKEVIRTUAL) || (seen == INVOKEINTERFACE)) { int parmCount = Type.getArgumentTypes(getSigConstantOperand()).length; if (stack.getStackDepth() > parmCount) { Index: SpuriousThreadStates.java =================================================================== RCS file: /cvsroot/fb-contrib/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/SpuriousThreadStates.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- SpuriousThreadStates.java 14 Jan 2006 03:19:39 -0000 1.6 +++ SpuriousThreadStates.java 31 Jan 2006 02:14:26 -0000 1.7 @@ -58,6 +58,8 @@ OpcodeStack.Item itm = null; try { + stack.mergeJumps(this); + if (seen == INVOKEVIRTUAL) { String className = getClassConstantOperand(); if ("java/lang/Object".equals(className)) { Index: InefficientStringBuffering.java =================================================================== RCS file: /cvsroot/fb-contrib/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/InefficientStringBuffering.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- InefficientStringBuffering.java 4 Jan 2006 02:40:42 -0000 1.7 +++ InefficientStringBuffering.java 31 Jan 2006 02:14:26 -0000 1.8 @@ -62,6 +62,8 @@ @Override public void sawOpcode(final int seen) { try { + opStack.mergeJumps(this); + if (seen == INVOKESPECIAL) { String calledClass = getClassConstantOperand(); if (("java/lang/StringBuffer".equals(calledClass) Index: OverlyConcreteParameter.java =================================================================== RCS file: /cvsroot/fb-contrib/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/OverlyConcreteParameter.java,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- OverlyConcreteParameter.java 4 Jan 2006 02:40:42 -0000 1.26 +++ OverlyConcreteParameter.java 31 Jan 2006 02:14:26 -0000 1.27 @@ -151,6 +151,8 @@ return; try { + stack.mergeJumps(this); + if ((seen == INVOKEVIRTUAL) || (seen == INVOKESTATIC) || (seen == INVOKESPECIAL) || (seen == INVOKEINTERFACE)) { String methodSig = getSigConstantOperand(); Type[] parmTypes = Type.getArgumentTypes(methodSig); |
