Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
fsharp
提交
8dfcc6a4
F
fsharp
项目概览
dotNET Platform
/
fsharp
12 个月 前同步成功
通知
0
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
fsharp
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
8dfcc6a4
编写于
10月 31, 2019
作者:
T
TIHan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Instead of using a queue, use CPS through other functions
上级
e6baf7f5
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
38 addition
and
54 deletion
+38
-54
src/fsharp/IlxGen.fs
src/fsharp/IlxGen.fs
+38
-54
未找到文件。
src/fsharp/IlxGen.fs
浏览文件 @
8dfcc6a4
...
...
@@ -2551,42 +2551,6 @@ and GenAllocUnionCase cenv cgbuf eenv (c,tyargs,args,m) sequel =
GenAllocUnionCaseCore
cenv
cgbuf
eenv
(
c
,
tyargs
,
args
.
Length
,
m
)
GenSequel
cenv
eenv
.
cloc
cgbuf
sequel
and
GenAfterMatch
cenv
cgbuf
eenv
afterJoin
stackAfterJoin
sequelAfterJoin
=
CG
.
SetMarkToHere
cgbuf
afterJoin
//assert(cgbuf.GetCurrentStack() = stackAfterJoin) // REVIEW: Since gen_dtree* now sets stack, stack should be stackAfterJoin at this point...
CG
.
SetStack
cgbuf
stackAfterJoin
// If any values are left on the stack after the join then we're certainly going to do something with them
// For example, we may be about to execute a 'stloc' for
//
// let y2 = if System.DateTime.Now.Year < 2000 then 1 else 2
//
// or a 'stelem' for
//
// arr.[0] <- if System.DateTime.Now.Year > 2000 then 1 else 2
//
// In both cases, any instructions that come after this point will be falsely associated with the last branch of the control
// prior to the join point. This is base, e.g. see FSharp 1.0 bug 5155
if
not
(
isNil
stackAfterJoin
)
then
cgbuf
.
EmitStartOfHiddenCode
()
GenSequel
cenv
eenv
.
cloc
cgbuf
sequelAfterJoin
and
GenDecisionTreeTargetQueue
cenv
cgbuf
(
targetQueue
:
Queue
<_>)
eenv
afterJoin
stackAfterJoin
sequelAfterJoin
contf
=
if
targetQueue
.
Count
>
0
then
let
f
=
targetQueue
.
Dequeue
()
let
genTargetInfoOpt
=
f
()
match
genTargetInfoOpt
with
|
Some
(
eenvAtTarget
,
spExprAtTarget
,
exprAtTarget
,
sequelAtTarget
)
->
GenLinearExpr
cenv
cgbuf
eenvAtTarget
spExprAtTarget
exprAtTarget
sequelAtTarget
true
(
fun
Fake
->
GenDecisionTreeTargetQueue
cenv
cgbuf
targetQueue
eenv
afterJoin
stackAfterJoin
sequelAfterJoin
contf
)
|
_
->
GenDecisionTreeTargetQueue
cenv
cgbuf
targetQueue
eenv
afterJoin
stackAfterJoin
sequelAfterJoin
contf
else
GenAfterMatch
cenv
cgbuf
eenv
afterJoin
stackAfterJoin
sequelAfterJoin
contf
Fake
and
GenLinearExpr
cenv
cgbuf
eenv
sp
expr
sequel
canProcessSequencePoint
(
contf
:
FakeUnit
->
FakeUnit
)
=
let
expr
=
stripExpr
expr
match
expr
with
...
...
@@ -2675,8 +2639,27 @@ and GenLinearExpr cenv cgbuf eenv sp expr sequel canProcessSequencePoint (contf:
// match-testing (dtrees) should not contribute to the stack.
// Each branch-RHS (targets) may contribute to the stack, leaving it in the "stackAfterJoin" state, for the join point.
// Since code is branching and joining, the cgbuf stack is maintained manually.
let
targetQueue
=
GenDecisionTreeAndTargets
cenv
cgbuf
stackAtTargets
eenv
tree
targets
repeatSP
sequelOnBranches
GenDecisionTreeTargetQueue
cenv
cgbuf
targetQueue
eenv
afterJoin
stackAfterJoin
sequelAfterJoin
contf
GenDecisionTreeAndTargets
cenv
cgbuf
stackAtTargets
eenv
tree
targets
repeatSP
sequelOnBranches
(
contf
<<
(
fun
Fake
->
CG
.
SetMarkToHere
cgbuf
afterJoin
//assert(cgbuf.GetCurrentStack() = stackAfterJoin) // REVIEW: Since gen_dtree* now sets stack, stack should be stackAfterJoin at this point...
CG
.
SetStack
cgbuf
stackAfterJoin
// If any values are left on the stack after the join then we're certainly going to do something with them
// For example, we may be about to execute a 'stloc' for
//
// let y2 = if System.DateTime.Now.Year < 2000 then 1 else 2
//
// or a 'stelem' for
//
// arr.[0] <- if System.DateTime.Now.Year > 2000 then 1 else 2
//
// In both cases, any instructions that come after this point will be falsely associated with the last branch of the control
// prior to the join point. This is base, e.g. see FSharp 1.0 bug 5155
if
not
(
isNil
stackAfterJoin
)
then
cgbuf
.
EmitStartOfHiddenCode
()
GenSequel
cenv
eenv
.
cloc
cgbuf
sequelAfterJoin
Fake
))
|
LinearOpExpr
(
TOp
.
UnionCase
c
,
tyargs
,
argsFront
,
argLast
,
m
)
->
if
canProcessSequencePoint
then
...
...
@@ -4857,17 +4840,19 @@ and GenJoinPoint cenv cgbuf pos eenv ty m sequel =
// go to the join point
Br
afterJoin
,
afterJoin
,
stackAfterJoin
,
sequel
and
GenPostponed
AndQueueTargets
cenv
cgbuf
(
queue
:
Queue
<_>)
targetInfos
stackAtTargets
sequel
=
and
GenPostponed
DecisionTreeTargets
cenv
cgbuf
targetInfos
stackAtTargets
sequel
(
contf
:
FakeUnit
->
FakeUnit
)
:
FakeUnit
=
match
targetInfos
with
|
[]
->
Non
e
|
[]
->
contf
Fak
e
|
(
KeyValue
(_,
(
targetInfo
,
isTargetPostponed
)))
::
rest
->
if
isTargetPostponed
then
queue
.
Enqueue
(
fun
()
->
GenPostponedAndQueueTargets
cenv
cgbuf
queue
rest
stackAtTargets
sequel
)
Some
(
GenDecisionTreeTarget
cenv
cgbuf
stackAtTargets
targetInfo
sequel
)
let
eenvAtTarget
,
spExprAtTarget
,
exprAtTarget
,
sequelAtTarget
=
GenDecisionTreeTarget
cenv
cgbuf
stackAtTargets
targetInfo
sequel
GenLinearExpr
cenv
cgbuf
eenvAtTarget
spExprAtTarget
exprAtTarget
sequelAtTarget
true
(
fun
Fake
->
GenPostponedDecisionTreeTargets
cenv
cgbuf
rest
stackAtTargets
sequel
contf
)
else
GenPostponed
AndQueueTargets
cenv
cgbuf
queue
rest
stackAtTargets
sequel
GenPostponed
DecisionTreeTargets
cenv
cgbuf
rest
stackAtTargets
sequel
contf
and
GenDecisionTreesAnd
QueueTargets
cenv
cgbuf
(
queue
:
Queue
<_>)
targetInfos
decisions
stackAtTargets
targets
repeatSP
sequel
=
and
GenDecisionTreesAnd
Targets
cenv
cgbuf
targetInfos
decisions
stackAtTargets
targets
repeatSP
sequel
contf
=
match
decisions
with
|
[]
->
let
sortedTargetInfos
=
...
...
@@ -4875,27 +4860,26 @@ and GenDecisionTreesAndQueueTargets cenv cgbuf (queue: Queue<_>) targetInfos dec
|>
Seq
.
sortBy
(
fun
(
KeyValue
(
targetIdx
,
_))
->
targetIdx
)
|>
List
.
ofSeq
GenPostponed
AndQueueTargets
cenv
cgbuf
queue
sortedTargetInfos
stackAtTargets
sequel
GenPostponed
DecisionTreeTargets
cenv
cgbuf
sortedTargetInfos
stackAtTargets
sequel
contf
|
(
inplabOpt
,
eenv
,
tree
)
::
rest
->
match
tree
with
|
TDSuccess
(
es
,
targetIdx
)
->
let
targetInfos
,
genTargetInfoOpt
=
GenDecisionTreeSuccess
cenv
cgbuf
inplabOpt
stackAtTargets
eenv
es
targetIdx
targets
repeatSP
targetInfos
sequel
match
genTargetInfoOpt
with
|
Some
_
->
queue
.
Enqueue
(
fun
()
->
GenDecisionTreesAndQueueTargets
cenv
cgbuf
queue
targetInfos
rest
stackAtTargets
targets
repeatSP
sequel
)
genTargetInfoOpt
|
Some
(
eenvAtTarget
,
spExprAtTarget
,
exprAtTarget
,
sequelAtTarget
)
->
GenLinearExpr
cenv
cgbuf
eenvAtTarget
spExprAtTarget
exprAtTarget
sequelAtTarget
true
(
fun
Fake
->
GenDecisionTreesAndTargets
cenv
cgbuf
targetInfos
rest
stackAtTargets
targets
repeatSP
sequel
contf
)
|
_
->
GenDecisionTreesAnd
QueueTargets
cenv
cgbuf
queue
targetInfos
rest
stackAtTargets
targets
repeatSP
sequel
GenDecisionTreesAnd
Targets
cenv
cgbuf
targetInfos
rest
stackAtTargets
targets
repeatSP
sequel
contf
|
_
->
let
newDecisions
=
GenDecisionTreeAndTargetsInner
cenv
cgbuf
inplabOpt
stackAtTargets
eenv
tree
targets
repeatSP
targetInfos
sequel
GenDecisionTreesAnd
QueueTargets
cenv
cgbuf
queue
targetInfos
(
newDecisions
@
rest
)
stackAtTargets
targets
repeatSP
sequel
GenDecisionTreesAnd
Targets
cenv
cgbuf
targetInfos
(
newDecisions
@
rest
)
stackAtTargets
targets
repeatSP
sequel
contf
// Accumulate the decision graph as we go
and
GenDecisionTreeAndTargets
cenv
cgbuf
stackAtTargets
eenv
tree
targets
repeatSP
sequel
:
(
Queue
<
unit
->
(
IlxGenEnv
*
EmitSequencePointState
*
Expr
*
sequel
)
option
>)
=
let
queue
=
Queue
()
queue
.
Enqueue
(
fun
()
->
GenDecisionTreesAndQueueTargets
cenv
cgbuf
queue
(
IntMap
.
empty
()
)
[(
None
,
eenv
,
tree
)]
stackAtTargets
targets
repeatSP
sequel
)
queue
and
GenDecisionTreeAndTargets
cenv
cgbuf
stackAtTargets
eenv
tree
targets
repeatSP
sequel
contf
=
GenDecisionTreesAndTargets
cenv
cgbuf
(
IntMap
.
empty
()
)
[(
None
,
eenv
,
tree
)]
stackAtTargets
targets
repeatSP
sequel
contf
and
TryFindTargetInfo
targetInfos
n
=
match
IntMap
.
tryFind
n
targetInfos
with
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录