git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
Merge pull request #134 from taku0/fix_inlining

Fix inlineVariables

commit4d724ad329678fd5ea212d5db304ce15d6c6cba0 authorPhil Freeman <paf31@cantab.net> dateMon 27 Jan 2014, 09:01 (13 years ago) parentcb5725085adeb3
2 files changed+44−11
compare with golang
unifiedsplit
examples/passing/Assign.purs+25−2 src/Language/PureScript/CodeGen/Optimize.hs+19−9
examples/passing/Assign.purs+25−2
@@ -3,11 +3,34 @@ module Assign where
33 sum = \n -> {
44 var x = 0;
55 for (i <- 0 until n) {
6− x = x + i;
6+ x = x + i;
77 }
88 return x;
99 }
10−
10+
11+ arr = [1, 2]
12+
13+ foo = {
14+ var x = 0; -- mutable
15+ var y = 1; -- immutable
16+
17+ -- x should not be inlined since x is mutable
18+ while (x < 10) {
19+ x = x + 1;
20+ }
21+
22+ var z1 = arr !! x; -- immutable
23+ var b = (\x -> z1) 2; -- z1 should not be inlined since x is bound
24+
25+ var z2 = arr !! x; -- immutable
26+ var z3 = arr !! x; -- immutable
27+ var a = (\z2 -> z2) 2; -- z3 should not be inlined since z2 is bound
28+
29+ -- y should be inlined
30+ -- z3 should be inlined
31+ return x + y + z1 + z2 + z3 + a + b;
32+ }
33+
1134module Main where
1235
1336main = Trace.trace "Done"
src/Language/PureScript/CodeGen/Optimize.hs+19−9
@@ -58,12 +58,12 @@ isReassigned var1 = everything (||) (mkQ False check)
5858 check _ = False
5959
6060isRebound :: (Data d) => JS -> d -> Bool
61−isRebound (JSVar var1) = everything (||) (mkQ False check)
61+isRebound js d = any (\var -> isReassigned var d) (variablesOf js)
6262 where
63− check :: JS -> Bool
64− check (JSFunction _ args _) | var1 `elem` args = True
65− check _ = False
66−isRebound _ = const False
63+ variablesOf (JSVar var) = [var]
64+ variablesOf (JSAccessor _ val) = variablesOf val
65+ variablesOf (JSIndexer index val) = variablesOf index ++ variablesOf val
66+ variablesOf _ = []
6767
6868isUsed :: (Data d) => Ident -> d -> Bool
6969isUsed var1 = everything (||) (mkQ False check)
@@ -72,9 +72,17 @@ isUsed var1 = everything (||) (mkQ False check)
7272 check (JSVar var2) | var1 == var2 = True
7373 check (JSAssignment target _) | var1 == targetVariable target = True
7474 check _ = False
75− targetVariable :: JSAssignment -> Ident
76− targetVariable (JSAssignVariable var) = var
77− targetVariable (JSAssignProperty _ tgt) = targetVariable tgt
75+
76+targetVariable :: JSAssignment -> Ident
77+targetVariable (JSAssignVariable var) = var
78+targetVariable (JSAssignProperty _ tgt) = targetVariable tgt
79+
80+isUpdated :: (Data d) => Ident -> d -> Bool
81+isUpdated var1 = everything (||) (mkQ False check)
82+ where
83+ check :: JS -> Bool
84+ check (JSAssignment target _) | var1 == targetVariable target = True
85+ check _ = False
7886
7987shouldInline :: JS -> Bool
8088shouldInline (JSVar _) = True
@@ -93,7 +101,9 @@ inlineVariables = everywhere (mkT removeFromBlock)
93101 removeFromBlock js = js
94102 go :: [JS] -> [JS]
95103 go [] = []
96− go (JSVariableIntroduction var (Just js) : sts) | shouldInline js && not (isReassigned var sts) && not (isRebound js sts) = go (replaceIdent var js sts)
104+ go (s@(JSVariableIntroduction var (Just js)) : sts)
105+ | shouldInline js && not (isReassigned var sts) && not (isRebound js sts) && not (isUpdated var sts) =
106+ go (replaceIdent var js sts)
97107 go (s:sts) = s : go sts
98108
99109removeUnusedVariables :: JS -> JS