objects with bamboo-parameter flags got dropped from analysis by accident

diff --git a/Robust/src/Analysis/Disjoint/AllocSite.java b/Robust/src/Analysis/Disjoint/AllocSite.java
index 5d5fea81cf3ede027a0139d359d4866dea049ad2..d50201580dc617f35be3294177afc876bd7e54b3 100644 (file)
--- a/Robust/src/Analysis/Disjoint/AllocSite.java
+++ b/Robust/src/Analysis/Disjoint/AllocSite.java
@@ -68,7 +68,23 @@ public class AllocSite extends Canonical {
     this.allocationDepth = allocationDepth;
     this.flatNew         = flatNew;
     this.disjointId      = disjointId;
-    this.isFlagged       = disjointId != null;
+
+    // mark this allocation site as being flagged
+    // for the analysis if
+    // 1) we have a non-null disjointID (a named flagged site) 
+    // OR
+    // 2) the type is a class with Bamboo-parameter flags 
+    this.isFlagged = false;
+
+    if( disjointId != null ) {
+      this.isFlagged = true;
+
+    } else if( flatNew.getType().isClass() &&
+               flatNew.getType().getClassDesc().hasFlags()
+               ) {
+      this.isFlagged = true;
+    }
+
 
     ithOldest = new Vector<Integer>( allocationDepth );
     id        = generateUniqueAllocSiteID();

diff --git a/Robust/src/Benchmarks/Ownership/makefile b/Robust/src/Benchmarks/Ownership/makefile
index 362589710c844516006d0278e394c531c4add2a0..6634c810d9652d7ee9c61a15acfa49e5d7152da8 100644 (file)
--- a/Robust/src/Benchmarks/Ownership/makefile
+++ b/Robust/src/Benchmarks/Ownership/makefile
@@ -1,25 +1,12 @@
 BUILDSCRIPT=~/research/Robust/src/buildscript
-BSFLAGS= -recover -justanalyze -ownership -ownaliasfiletab aliases.txt -enable-assertions #-ownwritedots final #-flatirtasks
-#BSFLAGS= -recover -justanalyze -ownership -ownaliasfile aliases.txt -enable-assertions #-ownwritedots final #-flatirtasks
-AD1= -ownallocdepth 1
-AD3= -ownallocdepth 3
-AD5= -ownallocdepth 5
-AD9= -ownallocdepth 9
+BSFLAGS= -recover -justanalyze -ownership -ownallocdepth 1 -enable-assertions #-ownwritedots final #-flatirtasks
 
-all: ad1
 
+tabbed:
+       $(BUILDSCRIPT) $(BSFLAGS) -ownaliasfiletab aliases.txt *.java
 
-ad1:
-       $(BUILDSCRIPT) $(BSFLAGS) $(AD1) *.java
-
-ad3:
-       $(BUILDSCRIPT) $(BSFLAGS) $(AD3) *.java
-
-ad5:
-       $(BUILDSCRIPT) $(BSFLAGS) $(AD5) *.java
-
-ad9:
-       $(BUILDSCRIPT) $(BSFLAGS) $(AD9) *.java
+normal:
+       $(BUILDSCRIPT) $(BSFLAGS) -ownaliasfile aliases.txt *.java
 
 
 #view: PNGs