Skip to content

cleanup begin / end #8290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cartermp merged 1 commit into from
Jan 20, 2020
Merged

cleanup begin / end #8290

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 24 additions & 26 deletions src/fsharp/IlxGen.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2786,32 +2786,30 @@ and GenNewArray cenv cgbuf eenv (elems: Expr list, elemTy, m) sequel =
GenNewArraySimple cenv cgbuf eenv (elems, elemTy, m) sequel

and GenCoerce cenv cgbuf eenv (e, tgty, m, srcty) sequel =
let g = cenv.g
// Is this an upcast?
if TypeRelations.TypeDefinitelySubsumesTypeNoCoercion 0 g cenv.amap m tgty srcty &&
// Do an extra check - should not be needed
TypeRelations.TypeFeasiblySubsumesType 0 g cenv.amap m tgty TypeRelations.NoCoerce srcty then
begin
if (isInterfaceTy g tgty) then (
GenExpr cenv cgbuf eenv SPSuppress e Continue
let ilToTy = GenType cenv.amap m eenv.tyenv tgty
// Section "III.1.8.1.3 Merging stack states" of ECMA-335 implies that no unboxing
// is required, but we still push the coerced type on to the code gen buffer.
CG.EmitInstrs cgbuf (pop 1) (Push [ilToTy]) []
GenSequel cenv eenv.cloc cgbuf sequel
) else (
GenExpr cenv cgbuf eenv SPSuppress e sequel
)
end
else
GenExpr cenv cgbuf eenv SPSuppress e Continue
if not (isObjTy g srcty) then
let ilFromTy = GenType cenv.amap m eenv.tyenv srcty
CG.EmitInstrs cgbuf (pop 1) (Push [g.ilg.typ_Object]) [ I_box ilFromTy ]
if not (isObjTy g tgty) then
let ilToTy = GenType cenv.amap m eenv.tyenv tgty
CG.EmitInstrs cgbuf (pop 1) (Push [ilToTy]) [ I_unbox_any ilToTy ]
GenSequel cenv eenv.cloc cgbuf sequel
let g = cenv.g
// Is this an upcast?
if TypeRelations.TypeDefinitelySubsumesTypeNoCoercion 0 g cenv.amap m tgty srcty &&
// Do an extra check - should not be needed
TypeRelations.TypeFeasiblySubsumesType 0 g cenv.amap m tgty TypeRelations.NoCoerce srcty
then
if isInterfaceTy g tgty then
GenExpr cenv cgbuf eenv SPSuppress e Continue
let ilToTy = GenType cenv.amap m eenv.tyenv tgty
// Section "III.1.8.1.3 Merging stack states" of ECMA-335 implies that no unboxing
// is required, but we still push the coerced type on to the code gen buffer.
CG.EmitInstrs cgbuf (pop 1) (Push [ilToTy]) []
GenSequel cenv eenv.cloc cgbuf sequel
else
GenExpr cenv cgbuf eenv SPSuppress e sequel
else
GenExpr cenv cgbuf eenv SPSuppress e Continue
if not (isObjTy g srcty) then
let ilFromTy = GenType cenv.amap m eenv.tyenv srcty
CG.EmitInstrs cgbuf (pop 1) (Push [g.ilg.typ_Object]) [ I_box ilFromTy ]
if not (isObjTy g tgty) then
let ilToTy = GenType cenv.amap m eenv.tyenv tgty
CG.EmitInstrs cgbuf (pop 1) (Push [ilToTy]) [ I_unbox_any ilToTy ]
GenSequel cenv eenv.cloc cgbuf sequel

and GenReraise cenv cgbuf eenv (rtnty, m) sequel =
let ilReturnTy = GenType cenv.amap m eenv.tyenv rtnty
Expand Down