diff options
| author | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2019-06-06 19:35:07 +0200 |
|---|---|---|
| committer | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2019-06-06 19:35:07 +0200 |
| commit | f3a13e7cb3d2f0758eb418050d48a240798f2f86 (patch) | |
| tree | 1ae03300d9dbd015f141eb48558cc775c52a09ea /backend/Selectionaux.ml | |
| parent | f73c85e2b18017997c52a0d9478726d31a601669 (diff) | |
| download | compcert-kvx-f3a13e7cb3d2f0758eb418050d48a240798f2f86.tar.gz compcert-kvx-f3a13e7cb3d2f0758eb418050d48a240798f2f86.zip | |
finish merging master branch (fixes problems in glpk colamd)
Diffstat (limited to 'backend/Selectionaux.ml')
| -rw-r--r-- | backend/Selectionaux.ml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/backend/Selectionaux.ml b/backend/Selectionaux.ml index 818660c1..4e366564 100644 --- a/backend/Selectionaux.ml +++ b/backend/Selectionaux.ml @@ -114,9 +114,5 @@ let if_conversion_heuristic cond ifso ifnot ty = if !Clflags.option_ffavor_branchless then true else if not (fast_cmove ty) then false else let c1 = cost_expr ifso and c2 = cost_expr ifnot in -<<<<<<< HEAD - c1 + c2 <= 30 && abs (c1 - c2) <= 8 -======= c1 + c2 <= 24 && abs (c1 - c2) <= 8 ->>>>>>> ddb2c968e6c57d2117434f169471d87f643d831a |