summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Source/Core/CommandLineOptions.cs1
-rw-r--r--Test/extractloops/runtest.bat8
-rw-r--r--Test/stratifiedinline/runtest.bat20
3 files changed, 15 insertions, 14 deletions
diff --git a/Source/Core/CommandLineOptions.cs b/Source/Core/CommandLineOptions.cs
index f2148158..2180efa7 100644
--- a/Source/Core/CommandLineOptions.cs
+++ b/Source/Core/CommandLineOptions.cs
@@ -1265,6 +1265,7 @@ namespace Microsoft.Boogie {
}
if (StratifiedInlining > 0) {
+ UseLabels = false;
TypeEncodingMethod = TypeEncoding.Monomorphic;
UseArrayTheory = true;
UseAbstractInterpretation = false;
diff --git a/Test/extractloops/runtest.bat b/Test/extractloops/runtest.bat
index 84422acd..4fbed727 100644
--- a/Test/extractloops/runtest.bat
+++ b/Test/extractloops/runtest.bat
@@ -5,15 +5,15 @@ set BGEXE=..\..\Binaries\Boogie.exe
rem set BGEXE=mono ..\..\Binaries\Boogie.exe
echo ----- Running regression test t1.bpl
-%BGEXE% %* /noinfer /doNotUseLabels /stratifiedInline:1 /extractLoops /removeEmptyBlocks:0 /coalesceBlocks:0 t1.bpl
+%BGEXE% %* /stratifiedInline:1 /extractLoops /removeEmptyBlocks:0 /coalesceBlocks:0 t1.bpl
echo -----
echo ----- Running regression test t2.bpl
-%BGEXE% %* /noinfer /doNotUseLabels /stratifiedInline:1 /extractLoops /removeEmptyBlocks:0 /coalesceBlocks:0 t2.bpl
+%BGEXE% %* /stratifiedInline:1 /extractLoops /removeEmptyBlocks:0 /coalesceBlocks:0 t2.bpl
echo -----
echo ----- Running regression test t3.bpl with recursion bound 2
-%BGEXE% %* /noinfer /doNotUseLabels /stratifiedInline:1 /extractLoops /removeEmptyBlocks:0 /coalesceBlocks:0 /recursionBound:2 t3.bpl
+%BGEXE% %* /stratifiedInline:1 /extractLoops /removeEmptyBlocks:0 /coalesceBlocks:0 /recursionBound:2 t3.bpl
echo -----
echo ----- Running regression test t3.bpl with recursion bound 4
-%BGEXE% %* /noinfer /doNotUseLabels /stratifiedInline:1 /extractLoops /removeEmptyBlocks:0 /coalesceBlocks:0 /recursionBound:4 t3.bpl
+%BGEXE% %* /stratifiedInline:1 /extractLoops /removeEmptyBlocks:0 /coalesceBlocks:0 /recursionBound:4 t3.bpl
echo -----
diff --git a/Test/stratifiedinline/runtest.bat b/Test/stratifiedinline/runtest.bat
index 2bb3cbd5..d260708b 100644
--- a/Test/stratifiedinline/runtest.bat
+++ b/Test/stratifiedinline/runtest.bat
@@ -5,33 +5,33 @@ set BGEXE=..\..\Binaries\Boogie.exe
rem set BGEXE=mono ..\..\Binaries\Boogie.exe
echo ----- Running regression test bar1.bpl
-%BGEXE% %* /noinfer /doNotUseLabels /stratifiedInline:1 bar1.bpl
+%BGEXE% %* /stratifiedInline:1 bar1.bpl
echo -----
echo ----- Running regression test bar2.bpl
-%BGEXE% %* /noinfer /doNotUseLabels /stratifiedInline:1 bar2.bpl
+%BGEXE% %* /stratifiedInline:1 bar2.bpl
echo -----
echo ----- Running regression test bar3.bpl
-%BGEXE% %* /noinfer /doNotUseLabels /stratifiedInline:1 bar3.bpl
+%BGEXE% %* /stratifiedInline:1 bar3.bpl
echo -----
echo ----- Running regression test bar4.bpl
-%BGEXE% %* /noinfer /doNotUseLabels /stratifiedInline:1 bar4.bpl
+%BGEXE% %* /stratifiedInline:1 bar4.bpl
echo -----
echo ----- Running regression test bar6.bpl
-%BGEXE% %* /noinfer /doNotUseLabels /stratifiedInline:1 bar6.bpl
+%BGEXE% %* /stratifiedInline:1 bar6.bpl
echo -----
echo ----- Running regression test bar7.bpl
-%BGEXE% %* /noinfer /doNotUseLabels /stratifiedInline:1 /nonUniformUnfolding bar7.bpl
+%BGEXE% %* /stratifiedInline:1 /nonUniformUnfolding bar7.bpl
echo -----
echo ----- Running regression test bar8.bpl
-%BGEXE% %* /noinfer /doNotUseLabels /stratifiedInline:1 /nonUniformUnfolding bar8.bpl
+%BGEXE% %* /stratifiedInline:1 /nonUniformUnfolding bar8.bpl
echo -----
echo ----- Running regression test bar9.bpl
-%BGEXE% %* /noinfer /doNotUseLabels /stratifiedInline:1 /nonUniformUnfolding bar9.bpl
+%BGEXE% %* /stratifiedInline:1 /nonUniformUnfolding bar9.bpl
echo -----
echo ----- Running regression test bar10.bpl
-%BGEXE% %* /noinfer /doNotUseLabels /stratifiedInline:1 /nonUniformUnfolding bar10.bpl
+%BGEXE% %* /stratifiedInline:1 /nonUniformUnfolding bar10.bpl
echo -----
echo ----- Running regression test bar11.bpl
-%BGEXE% %* /noinfer /doNotUseLabels /stratifiedInline:1 bar11.bpl
+%BGEXE% %* /stratifiedInline:1 bar11.bpl
echo -----