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:17:50 +0200 |
commit | 136986c204af19341aeb455d72fe817b16fa6fff (patch) | |
tree | 02e9178d9f2cf942bd32366891d480ff161406f6 /backend/Linearizeaux.ml | |
parent | c46723c0169145d41d1879c236f53314456f1ba1 (diff) | |
parent | 1cb3d93ff278ebbd0c6967c5f9401a97f9b618b4 (diff) | |
download | compcert-136986c204af19341aeb455d72fe817b16fa6fff.tar.gz compcert-136986c204af19341aeb455d72fe817b16fa6fff.zip |
Merge remote branch 'upstream/master' into clean
Conflicts:
Makefile.extr
Diffstat (limited to 'backend/Linearizeaux.ml')
-rw-r--r-- | backend/Linearizeaux.ml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/backend/Linearizeaux.ml b/backend/Linearizeaux.ml index ef268562..71ee2e56 100644 --- a/backend/Linearizeaux.ml +++ b/backend/Linearizeaux.ml @@ -26,7 +26,7 @@ let enumerate_aux f reach = (fun pc nodes -> if PMap.get pc reach then Coq_cons (pc, nodes) - else nodes) + else nodes) f.fn_nextpc ***) @@ -100,7 +100,7 @@ let basic_blocks f joins = (* end_block: record block that we just discovered *) and end_block blk minpc = blocks := (minpc, List.rev blk) :: !blocks - in + in start_block f.fn_entrypoint; !blocks (* Flatten basic blocks in decreasing order of minpc *) |