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 /common/Switchaux.ml | |
| 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 'common/Switchaux.ml')
| -rw-r--r-- | common/Switchaux.ml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/Switchaux.ml b/common/Switchaux.ml index 39b484c7..0d4901bf 100644 --- a/common/Switchaux.ml +++ b/common/Switchaux.ml @@ -50,7 +50,7 @@ let compile_switch_as_tree modulus default tbl = let (key1, act1) = sw.(lo) and (key2, act2) = sw.(lo+1) and (key3, act3) = sw.(lo+2) in - CTifeq(key1, act1, + CTifeq(key1, act1, CTifeq(key2, act2, if Z.sub maxval minval = Z.of_uint 2 then CTaction act3 |