diff options
author | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-09-21 19:13:07 +0200 |
---|---|---|
committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-09-21 19:13:07 +0200 |
commit | 4b9b0e8f988cdfa1f848919b41bfe24c6e9a052a (patch) | |
tree | 0068ca2f3c45ffb7e07db62d681ccd3b96bcb167 /backend/Constprop.v | |
parent | a34b64ee2e7a535ebc0fc731243ab520c4ba430f (diff) | |
parent | 9147350fdb47f3471ce6d9202b7c996f79ffab2d (diff) | |
download | compcert-4b9b0e8f988cdfa1f848919b41bfe24c6e9a052a.tar.gz compcert-4b9b0e8f988cdfa1f848919b41bfe24c6e9a052a.zip |
Merge branch 'debugscopes' into debug_locations
Conflicts:
debug/CtoDwarf.ml
debug/DwarfPrinter.ml
Diffstat (limited to 'backend/Constprop.v')
-rw-r--r-- | backend/Constprop.v | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/backend/Constprop.v b/backend/Constprop.v index cd844d30..8f4cb76d 100644 --- a/backend/Constprop.v +++ b/backend/Constprop.v @@ -144,9 +144,9 @@ Fixpoint debug_strength_reduction (ae: AE.t) (al: list (builtin_arg reg)) := | a :: al => let a' := builtin_arg_reduction ae a in let al' := a :: debug_strength_reduction ae al in - match a' with - | BA_int _ | BA_long _ | BA_float _ | BA_single _ => a' :: al' - | _ => al' + match a, a' with + | BA _, (BA_int _ | BA_long _ | BA_float _ | BA_single _) => a' :: al' + | _, _ => al' end end. |