From: jjenista <jjenista>
Date: Thu, 18 Sep 2008 22:02:16 +0000 (+0000)
Subject: pull in class files that already exist in library
X-Git-Tag: buildscript^7~97
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9052cf5b5cf49fd9a4679fb9a882421fc5f38bf3;p=IRC.git

pull in class files that already exist in library
---

diff --git a/Robust/src/Analysis/OwnershipAnalysis/AllocationSite.java b/Robust/src/Analysis/OwnershipAnalysis/AllocationSite.java
index f3da5e80..34864eb7 100644
--- a/Robust/src/Analysis/OwnershipAnalysis/AllocationSite.java
+++ b/Robust/src/Analysis/OwnershipAnalysis/AllocationSite.java
@@ -27,7 +27,7 @@ public class AllocationSite {
   protected int allocationDepth;
   protected Vector<Integer> ithOldest;
   protected Integer summary;
-  protected TypeDescriptor type;
+  protected FlatNew flatNew;
 
   public static final int AGE_notInThisSite = 100;
   public static final int AGE_in_I          = 101;
@@ -40,11 +40,11 @@ public class AllocationSite {
   public static final int SHADOWAGE_summary       = -103;
 
 
-  public AllocationSite(int allocationDepth, TypeDescriptor type) {
+  public AllocationSite(int allocationDepth, FlatNew flatNew) {
     assert allocationDepth >= 1;
 
     this.allocationDepth = allocationDepth;
-    this.type            = type;
+    this.flatNew         = flatNew;
 
     ithOldest = new Vector<Integer>(allocationDepth);
     id        = generateUniqueAllocationSiteID();
@@ -103,8 +103,12 @@ public class AllocationSite {
     return -summary;
   }
 
+  public FlatNew getFlatNew() {
+    return flatNew;
+  }
+
   public TypeDescriptor getType() {
-    return type;
+    return flatNew.getType();
   }
 
   public int getAgeCategory(Integer id) {
@@ -169,6 +173,6 @@ public class AllocationSite {
   }
 
   public String toStringVerbose() {
-    return "allocSite" + id + " "+type.toPrettyString();
+    return "allocSite" + id + " "+flatNew.getType().toPrettyString();
   }
 }
diff --git a/Robust/src/Analysis/OwnershipAnalysis/OwnershipAnalysis.java b/Robust/src/Analysis/OwnershipAnalysis/OwnershipAnalysis.java
index a7730c57..f28ce127 100644
--- a/Robust/src/Analysis/OwnershipAnalysis/OwnershipAnalysis.java
+++ b/Robust/src/Analysis/OwnershipAnalysis/OwnershipAnalysis.java
@@ -106,7 +106,7 @@ public class OwnershipAnalysis {
 	  AllocationSite as = (AllocationSite) allocItr.next();
 	  if( createsPotentialAliases(td, i, as) ) {
 	    foundSomeAlias = true;
-	    bw.write("Potential alias between parameter "+i+" and "+as+".\n");
+	    bw.write("Potential alias between parameter "+i+" and "+as.getFlatNew()+".\n");
 	  }
 	}
       }
@@ -126,7 +126,7 @@ public class OwnershipAnalysis {
 	  if( !outerChecked.contains(as2) &&
 	      createsPotentialAliases(td, as1, as2) ) {
 	    foundSomeAlias = true;
-	    bw.write("Potential alias between "+as1+" and "+as2+".\n");
+	    bw.write("Potential alias between "+as1.getFlatNew()+" and "+as2.getFlatNew()+".\n");
 	  }
 	}
 
@@ -686,7 +686,7 @@ public class OwnershipAnalysis {
   private AllocationSite getAllocationSiteFromFlatNewPRIVATE(FlatNew fn) {
 
     if( !mapFlatNewToAllocationSite.containsKey(fn) ) {
-      AllocationSite as = new AllocationSite(allocationDepth, fn.getType() );
+      AllocationSite as = new AllocationSite(allocationDepth, fn );
 
       // the newest nodes are single objects
       for( int i = 0; i < allocationDepth; ++i ) {
diff --git a/Robust/src/Main/Main.java b/Robust/src/Main/Main.java
index 05e5c99c..2dd61672 100644
--- a/Robust/src/Main/Main.java
+++ b/Robust/src/Main/Main.java
@@ -174,6 +174,12 @@ public class Main {
     readSourceFile(state, ClassLibraryPrefix+"gnu/Random.java");
     readSourceFile(state, ClassLibraryPrefix+"Vector.java");
     readSourceFile(state, ClassLibraryPrefix+"Enumeration.java");
+    readSourceFile(state, ClassLibraryPrefix+"Dictionary.java");
+    readSourceFile(state, ClassLibraryPrefix+"Writer.java");
+    readSourceFile(state, ClassLibraryPrefix+"BufferedWriter.java");
+    readSourceFile(state, ClassLibraryPrefix+"OutputStreamWriter.java");
+    readSourceFile(state, ClassLibraryPrefix+"FileWriter.java");
+    readSourceFile(state, ClassLibraryPrefix+"Date.java");
 
     if (state.TASK) {
       readSourceFile(state, ClassLibraryPrefix+"Object.java");