From 88077ce7552941eec7c762d864328ba689e36278 Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Fri, 20 Mar 2009 15:16:20 +0000 Subject: [PATCH] Cleared up a problem where passes from the Rain list could be enabled in occam and vice versa --- pass/PassList.hs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pass/PassList.hs b/pass/PassList.hs index 0788635..ee4cf41 100644 --- a/pass/PassList.hs +++ b/pass/PassList.hs @@ -59,7 +59,6 @@ commonPasses opts = concat $ , enablePassesWhen (not . csUsageChecking) [pass "Usage checking turned OFF" Prop.agg_namesDone [Prop.parUsageChecked] return] - -- TODO add an implicit mobility pass after these two: , enablePassesWhen csClassicOccamMobility [mobiliseArrays, inferDeref, implicitMobility] , simplifyAbbrevs , simplifyComms @@ -100,8 +99,10 @@ nullStateBodies = Pass getPassList :: CompState -> [Pass] getPassList optsPS = checkList $ filterPasses optsPS $ concat [ [nullStateBodies] - , occamPasses - , rainPasses + , enablePassesWhen ((== FrontendOccam) . csFrontend) + occamPasses + , enablePassesWhen ((== FrontendRain) . csFrontend) + rainPasses , commonPasses optsPS , genCPasses , genCPPCSPPasses