Commit503d167

authored and

committed

undo #3536 (#3746)

1 parent68f4187 commit503d167Copy full SHA for 503d167

File tree

+19

-3

lines changed

+19

-3

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -394,6 +394,7 @@ let LowerSeqExpr g amap overallExpr =`
`394`	`394`	`\| None->`
`395`	`395`	`None`
`396`	`396`
	`397`	`+(*`
`397`	`398`	`\| Expr.LetRec(binds,e2,m,_)`
`398`	`399`	`when // Restriction: only limited forms of "let rec" in sequence expressions can be handled by assignment to state local values`
`399`	`400`
`@@ -422,7 +423,7 @@ let LowerSeqExpr g amap overallExpr =`
`422`	`423`	`Some res4`
`423`	`424`	`\| None ->`
`424`	`425`	`None`
`425`		`-`
	`426`	`+*)`
`426`	`427`	`\| Expr.Match(spBind,exprm,pt,targets,m,ty)when targets\|> Array.forall(fun(TTarget(vs,_e,_spTarget))-> isNil vs)->`
`427`	`428`	`// lower all the targets. abandon if any fail to lower`
`428`	`429`	`lettgl= targets\|> Array.map(fun(TTarget(_vs,e,_spTarget))-> Lowerfalse isTailCall noDisposeContinuationLabel currentDisposeContinuationLabel e)\|> Array.toList`

Lines changed: 17 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -572,6 +572,7 @@ module InfiniteSequenceExpressionsExecuteWithFiniteResources =`
`572`	`572`	`yield! seqThreeRecCapturingOne r`
`573`	`573`	`}`
`574`	`574`
	`575`	`+//`
`575`	`576`	`// These tests will stackoverflow or out-of-memory if the above functions are not compiled to "sequence epression tailcalls",`
`576`	`577`	`// i.e. by compiling them to a state machine`
`577`	`578`	`lettests()=`
`@@ -697,8 +698,22 @@ module InfiniteSequenceExpressionsExecuteWithFiniteResources =`
`697`	`698`
`698`	`699`	`*)`
`699`	`700`
`700`		`-InfiniteSequenceExpressionsExecuteWithFiniteResources.tests()`
`701`		`-`
	`701`	`+// Tests disabled due to bug https://github.com/Microsoft/visualfsharp/issues/3743`
	`702`	`+//InfiniteSequenceExpressionsExecuteWithFiniteResources.tests()`
	`703`	`+`
	`704`	`+// This is the additional test case related to bug https://github.com/Microsoft/visualfsharp/issues/3743`
	`705`	`+letTestRecFuncInSeq()=`
	`706`	`+letfactorials=`
	`707`	`+[for xin0..10do`
	`708`	`+let recfactorial x=`
	`709`	`+match xwith`
	`710`	`+\|0->1`
	`711`	`+\| x-> x* factorial(x-1)`
	`712`	`+yield factorial x`
	`713`	`+]`
	`714`	`+`
	`715`	`+for fin factorialsdo printf"%i" f`
	`716`	`+ TestRecFuncInSeq()`
`702`	`717`
`703`	`718`	`(*---------------------------------------------------------------------------`
`704`	`719`	`!* wrap up`

Comments

(0)