[Fb-contrib-commit] SF.net SVN: fb-contrib: [882] trunk/fb-contrib

[<dbr...@us...>]

Revision: 882
          http://svn.sourceforge.net/fb-contrib/?rev=882&view=rev
Author:   dbrosius
Date:     2007-03-16 19:01:58 -0700 (Fri, 16 Mar 2007)

Log Message:
-----------
fix for bug [ 1678805 ] False+: UCC_UNRELATED_COLLECTION_CONTENTS

reused reg slots, and no variable table attribute

Modified Paths:
--------------
    trunk/fb-contrib/samples/UCC_Sample.java
    trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/UnrelatedCollectionContents.java

Modified: trunk/fb-contrib/samples/UCC_Sample.java
===================================================================
--- trunk/fb-contrib/samples/UCC_Sample.java	2007-03-13 03:31:20 UTC (rev 881)
+++ trunk/fb-contrib/samples/UCC_Sample.java	2007-03-17 02:01:58 UTC (rev 882)
@@ -1,4 +1,5 @@
 import java.awt.Color;
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.GregorianCalendar;
@@ -44,4 +45,17 @@
 		s.add(new int[]{ 3,2});
 		s.add(new Color(0, 128, 255));
 	}
+
+	public void bug1678805()
+	{
+		final File[] files = new File[5];
+		for (int i = 0; i < 5; i++)
+			files[i] = getPath();
+
+	}
+
+	private File getPath()
+	{
+		return new File("c:\\temp");
+	}
 }
\ No newline at end of file

Modified: trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/UnrelatedCollectionContents.java
===================================================================
--- trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/UnrelatedCollectionContents.java	2007-03-13 03:31:20 UTC (rev 881)
+++ trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/UnrelatedCollectionContents.java	2007-03-17 02:01:58 UTC (rev 882)
@@ -145,6 +145,10 @@
 					OpcodeStack.Item addItm = stack.getStackItem(0);
 					checkAdd(arrayItm, addItm);
 				}
+			} else if (seen == ASTORE) {
+				Integer reg = Integer14.valueOf(RegisterUtils.getAStoreReg(this, seen));
+				localCollections.remove(reg);
+				localSourceLineAnnotations.remove(reg);
 			}
 		} catch (ClassNotFoundException cnfe) {
 			bugReporter.reportMissingClass(cnfe);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.