From 0b2602be836147c37c7aeae49782c51ef7ca7387 Mon Sep 17 00:00:00 2001 From: yeom Date: Tue, 20 Sep 2011 23:52:56 +0000 Subject: [PATCH] take out the loop termination analysis from the java optimization phase. it will happens during the SSJava checking. --- Robust/src/Analysis/SSJava/SSJavaAnalysis.java | 4 ++-- Robust/src/Main/Main.java | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Robust/src/Analysis/SSJava/SSJavaAnalysis.java b/Robust/src/Analysis/SSJava/SSJavaAnalysis.java index 0c0b477a..a768b7f6 100644 --- a/Robust/src/Analysis/SSJava/SSJavaAnalysis.java +++ b/Robust/src/Analysis/SSJava/SSJavaAnalysis.java @@ -116,7 +116,7 @@ public class SSJavaAnalysis { // inference(); doFlowDownCheck(); doDefinitelyWrittenCheck(); - debugDoLoopCheck(); + doLoopCheck(); } private void inference() { @@ -124,7 +124,7 @@ public class SSJavaAnalysis { inferEngine.inference(); } - private void debugDoLoopCheck() { + private void doLoopCheck() { GlobalFieldType gft = new GlobalFieldType(callgraph, state, tu.getMain()); LoopOptimize lo = new LoopOptimize(gft, tu); diff --git a/Robust/src/Main/Main.java b/Robust/src/Main/Main.java index 0b994ec2..e4343618 100644 --- a/Robust/src/Main/Main.java +++ b/Robust/src/Main/Main.java @@ -512,9 +512,6 @@ public class Main { dc.optimize(fm); if (!state.NOLOOP){ lo.analyze(fm); - if(state.SSJAVA){ - ssjava.doLoopTerminationCheck(lo,fm); - } lo.optimize(fm); } -- 2.34.1