git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
Fix inlineVariables
85adeb3taku0
examples/passing/Assign.purs+25−2
compare with golang
unifiedsplit
@@ -3,11 +3,34 @@ module Assign where
3 sum = \n -> {
3 sum = \n -> {
4 var x = 0;
4 var x = 0;
5 for (i <- 0 until n) {
5 for (i <- 0 until n) {
6− x = x + i;
6+ x = x + i;
7 }
7 }
8 return x;
8 return x;
9 }
9 }
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+
11module Main where
34module Main where
12
35
13main = Trace.trace "Done"
36main = Trace.trace "Done"
src/Language/PureScript/CodeGen/Optimize.hs+19−9
@@ -58,12 +58,12 @@ isReassigned var1 = everything (||) (mkQ False check)
58 check _ = False
58 check _ = False
59
59
60isRebound :: (Data d) => JS -> d -> Bool
60isRebound :: (Data d) => JS -> d -> Bool
61−isRebound (JSVar var1) = everything (||) (mkQ False check)
61+isRebound js d = any (\var -> isReassigned var d) (variablesOf js)
62 where
62 where
63− check :: JS -> Bool
63+ variablesOf (JSVar var) = [var]
64− check (JSFunction _ args _) | var1 `elem` args = True
64+ variablesOf (JSAccessor _ val) = variablesOf val
65− check _ = False
65+ variablesOf (JSIndexer index val) = variablesOf index ++ variablesOf val
66−isRebound _ = const False
66+ variablesOf _ = []
67
67
68isUsed :: (Data d) => Ident -> d -> Bool
68isUsed :: (Data d) => Ident -> d -> Bool
69isUsed var1 = everything (||) (mkQ False check)
69isUsed var1 = everything (||) (mkQ False check)
@@ -72,9 +72,17 @@ isUsed var1 = everything (||) (mkQ False check)
72 check (JSVar var2) | var1 == var2 = True
72 check (JSVar var2) | var1 == var2 = True
73 check (JSAssignment target _) | var1 == targetVariable target = True
73 check (JSAssignment target _) | var1 == targetVariable target = True
74 check _ = False
74 check _ = False
75+
75− targetVariable :: JSAssignment -> Ident
76+targetVariable :: JSAssignment -> Ident
76− targetVariable (JSAssignVariable var) = var
77+targetVariable (JSAssignVariable var) = var
77− targetVariable (JSAssignProperty _ tgt) = targetVariable tgt
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
78
86
79shouldInline :: JS -> Bool
87shouldInline :: JS -> Bool
80shouldInline (JSVar _) = True
88shouldInline (JSVar _) = True
@@ -93,7 +101,9 @@ inlineVariables = everywhere (mkT removeFromBlock)
93 removeFromBlock js = js
101 removeFromBlock js = js
94 go :: [JS] -> [JS]
102 go :: [JS] -> [JS]
95 go [] = []
103 go [] = []
104+ go (s@(JSVariableIntroduction var (Just js)) : sts)
96− go (JSVariableIntroduction var (Just js) : sts) | shouldInline js && not (isReassigned var sts) && not (isRebound js sts) = go (replaceIdent var js sts)
105+ | shouldInline js && not (isReassigned var sts) && not (isRebound js sts) && not (isUpdated var sts) =
106+ go (replaceIdent var js sts)
97 go (s:sts) = s : go sts
107 go (s:sts) = s : go sts
98
108
99removeUnusedVariables :: JS -> JS
109removeUnusedVariables :: JS -> JS