git.iko.soy/Idris-dev
on master help sign in
javascript: optimize eval tailcalls
dac0a39raichoo
jsrts/Runtime-common.js+8
compare with master
unifiedsplit
@@ -49,3 +49,11 @@ var __IDRRT__tailcall = function(k) {
49
49
50 return ret;
50 return ret;
51};
51};
52+
53+var __IDRRT__EVALTC = function(arg0) {
54+ var ret = (arg0 instanceof __IDRRT__Con && __IDRLT__mEVAL0[arg0.tag])?(__IDRLT__mEVAL0[arg0.tag](arg0)):(arg0);
55+ while (ret instanceof __IDRRT__Cont)
56+ ret = ret.k();
57+
58+ return ret;
59+};
src/IRTS/CodegenJavaScript.hs+55−1
@@ -848,6 +848,58 @@ elimDuplicateEvals (JSAlloc fun (Just (JSFunction args (JSSeq seq)))) =
848
848
849elimDuplicateEvals js = js
849elimDuplicateEvals js = js
850
850
851+optimizeEvalTailcalls :: JS -> JS
852+optimizeEvalTailcalls (JSApp (JSIdent "__IDRRT__tailcall") [
853+ JSFunction [] (JSReturn (JSApp (JSIdent "__IDR__mEVAL0") args))
854+ ]) = JSApp (JSIdent "__IDRRT__EVALTC") $ map optimizeEvalTailcalls args
855+
856+optimizeEvalTailcalls (JSFunction args body) =
857+ JSFunction args $ optimizeEvalTailcalls body
858+
859+optimizeEvalTailcalls (JSSeq seq) =
860+ JSSeq $ map optimizeEvalTailcalls seq
861+
862+optimizeEvalTailcalls (JSReturn ret) =
863+ JSReturn $ optimizeEvalTailcalls ret
864+
865+optimizeEvalTailcalls (JSApp lhs rhs) =
866+ JSApp (optimizeEvalTailcalls lhs) (map optimizeEvalTailcalls rhs)
867+
868+optimizeEvalTailcalls (JSNew con args) =
869+ JSNew con $ map optimizeEvalTailcalls args
870+
871+optimizeEvalTailcalls (JSOp op lhs rhs) =
872+ JSOp op (optimizeEvalTailcalls lhs) (optimizeEvalTailcalls rhs)
873+
874+optimizeEvalTailcalls (JSProj obj field) =
875+ JSProj (optimizeEvalTailcalls obj) field
876+
877+optimizeEvalTailcalls (JSArray vals) =
878+ JSArray $ map optimizeEvalTailcalls vals
879+
880+optimizeEvalTailcalls (JSAssign lhs rhs) =
881+ JSAssign (optimizeEvalTailcalls lhs) (optimizeEvalTailcalls rhs)
882+
883+optimizeEvalTailcalls (JSAlloc var (Just val)) =
884+ JSAlloc var (Just $ optimizeEvalTailcalls val)
885+
886+optimizeEvalTailcalls (JSIndex lhs rhs) =
887+ JSIndex (optimizeEvalTailcalls lhs) (optimizeEvalTailcalls rhs)
888+
889+optimizeEvalTailcalls (JSCond conds) =
890+ JSCond $ map (optimizeEvalTailcalls *** optimizeEvalTailcalls) conds
891+
892+optimizeEvalTailcalls (JSTernary c t f) =
893+ JSTernary (
894+ optimizeEvalTailcalls c
895+ ) (
896+ optimizeEvalTailcalls t
897+ ) (
898+ optimizeEvalTailcalls f
899+ )
900+
901+optimizeEvalTailcalls js = js
902+
851reduceLoop :: [String] -> ([JS], [JS]) -> [JS]
903reduceLoop :: [String] -> ([JS], [JS]) -> [JS]
852reduceLoop reduced (cons, program) =
904reduceLoop reduced (cons, program) =
853 case partition findConstructors program of
905 case partition findConstructors program of
@@ -976,7 +1028,9 @@ codegenJavaScript target definitions filename outputType = do
976 removeAlloc = map removeAllocations constrInit
1028 removeAlloc = map removeAllocations constrInit
977 deadElim = elimDeadLoop removeAlloc
1029 deadElim = elimDeadLoop removeAlloc
978 inlined = inlineFunctions deadElim
1030 inlined = inlineFunctions deadElim
979− js = map elimDuplicateEvals inlined in
1031+ elimDup = map elimDuplicateEvals inlined
1032+ evalTC = map optimizeEvalTailcalls elimDup
1033+ js = evalTC in
980 map compileJS js
1034 map compileJS js
981
1035
982 mainLoop :: JS
1036 mainLoop :: JS