diff options
author | François Pottier <francois.pottier@inria.fr> | 2015-10-23 15:08:33 +0200 |
---|---|---|
committer | François Pottier <francois.pottier@inria.fr> | 2015-10-23 15:08:33 +0200 |
commit | 8b817cda643d180d43ab8c84809ca2d55c7dd3df (patch) | |
tree | 812fe2f7ec68c03c5f0762f1266f383193bbfe92 /backend/Tailcall.v | |
parent | c46723c0169145d41d1879c236f53314456f1ba1 (diff) | |
parent | 1cb3d93ff278ebbd0c6967c5f9401a97f9b618b4 (diff) | |
download | compcert-8b817cda643d180d43ab8c84809ca2d55c7dd3df.tar.gz compcert-8b817cda643d180d43ab8c84809ca2d55c7dd3df.zip |
Merge remote branch 'upstream/master' into clean
Conflicts:
Makefile.extr
Diffstat (limited to 'backend/Tailcall.v')
-rw-r--r-- | backend/Tailcall.v | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/backend/Tailcall.v b/backend/Tailcall.v index db246fec..e8ce9e25 100644 --- a/backend/Tailcall.v +++ b/backend/Tailcall.v @@ -27,7 +27,7 @@ Require Import Conventions. If the current function had a non-empty stack block, it could be that the called function accesses it, for instance if a pointer into the -stack block is passed as an argument. In this case, it would be +stack block is passed as an argument. In this case, it would be semantically incorrect to deallocate the stack block before the call, as [Itailcall] does. Therefore, the optimization can only be performed if the stack block of the current function is empty, in which case it makes @@ -47,7 +47,7 @@ The general pattern we recognize is therefore: The [is_return] function below recognizes this pattern. *) -Fixpoint is_return (n: nat) (f: function) (pc: node) (rret: reg) +Fixpoint is_return (n: nat) (f: function) (pc: node) (rret: reg) {struct n}: bool := match n with | O => false |