Blu

colder · Jul 13, 2012 · 8545416 · 8545416
1 parent e291286
commit 8545416
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 37 deletions.
diff --git a/src/insane/alias/PointToAnalysis.scala b/src/insane/alias/PointToAnalysis.scala
@@ -2168,52 +2168,50 @@ trait PointToAnalysis extends PointToGraphsDefs with PointToEnvs with PointToLat
 
           val cfgBefore  = getPTCFGFromFun(fun)
           globalTStart = System.currentTimeMillis
-          //analyze(fun)
-          specializedAnalyze(fun, BluntAnalysis, TypeSignature.fromDeclaration(fun.symbol))
+          analyze(fun)
+          //specializedAnalyze(fun, BluntAnalysis, TypeSignature.fromDeclaration(fun.symbol))
+
           val cfgAfter   = getPTCFGFromFun(fun)
 
-          if (cfgAfter != cfgBefore && !cfgAfter.isFlat) {
-            // we only reanalyze if the new cfg changed and is non trivial
-            workList = fun :: workList
-          } else {
-            // Finished analyzing fun
-            resultsStats.total += 1
-
-            val methodFlags = fun.symbol.flagBitsToString(fun.symbol.flags)
-
-            val category = if (cfgAfter.isFlat) {
-              if (cfgAfter.isTop) {
-                "top"
-              } else if (cfgAfter.isBottom) {
-                "bottom"
-              } else if (cfgAfter.isPure) {
-                "pure"
-              } else {
-                "impure"
-              }
+          // Finished analyzing fun
+          resultsStats.total += 1
+
+          val methodFlags = fun.symbol.flagBitsToString(fun.symbol.flags)
+          var nCalls = 0;
+
+          val category = if (cfgAfter.isFlat) {
+            if (cfgAfter.isTop) {
+              "top"
+            } else if (cfgAfter.isBottom) {
+              "bottom"
+            } else if (cfgAfter.isPure) {
+              "pure"
             } else {
+              "impure"
+            }
+          } else {
+            val condCFG = analyzePTCFG(fun, ConditionalAnalysis, TypeSignature.fromDeclaration(fun.symbol))
 
-              val condCFG = analyzePTCFG(fun, ConditionalAnalysis, TypeSignature.fromDeclaration(fun.symbol))
+            nCalls = cfgAfter.graph.E.collect{ case CFGEdge(_, aam: CFG.AssignApplyMeth, _) => aam }.size
 
-              condCFG match {
-                case Some(cfg) if cfg.isPure =>
-                  "condPure"
+            condCFG match {
+              case Some(cfg) if cfg.isPure =>
+                "condPure"
 
-                case Some(cfg) =>
-                  "condImpure"
+              case Some(cfg) =>
+                "condImpure"
 
-                case None =>
-                  reporter.error("Failed to produce an effect, BLEH")
-                  "ERROR"
-              }
+              case None =>
+                reporter.error("Failed to produce an effect, BLEH")
+                "ERROR"
             }
+          }
 
-            lastResults.append((fun.symbol, category))
-            resultsLog.println(category+"\t"+fun.symbol.fullName+"\t"+methodFlags+"\t"+(System.currentTimeMillis() / 1000L))
+          lastResults.append((fun.symbol, category))
+          resultsLog.println(category+"\t"+fun.symbol.fullName+"\t"+methodFlags+"\t"+(System.currentTimeMillis() / 1000L)+"\t"+nCalls)
 
-            ptProgressBar.tick
-            ptProgressBar.draw()
-          }
+          ptProgressBar.tick
+          ptProgressBar.draw()
         }
 
         ptProgressBar.end();

diff --git a/src/insane/utils/Settings.scala b/src/insane/utils/Settings.scala
@@ -124,7 +124,7 @@ class Settings {
    * precise type signatures up to `contSenDepth` depth.
    */
   var contSenDepthWhenPrecise = 1;
-    
+
   // Same, but when doing blunt analysis
   var contSenDepthMax         = 1;