Fix mis-merge of 'dwarf: Multi-register CFI address support'

This should be a fixup to 13b6c7639cfdca892a3f02b63596b097e1839f38:
'dwarf: Multi-register CFI address support'.

2022-06-30  Kwok Cheung Yeung  <kcy@codesourcery.com>

	gcc/
	* dwarf2cfi.cc (get_cfa_from_loc_descr): Check op against DW_OP_bregx.

diff --git a/gcc/ChangeLog.omp b/gcc/ChangeLog.omp
index af922a6cb1e724c9ce406b38cbf10572408cbfbc..24e22e19ae8bfdad497d0f764f4f3a7985eb154c 100644 (file)
--- a/gcc/ChangeLog.omp
+++ b/gcc/ChangeLog.omp
@@ -1,3 +1,7 @@
+2022-06-30  Kwok Cheung Yeung  <kcy@codesourcery.com>
+
+       * dwarf2cfi.cc (get_cfa_from_loc_descr): Check op against DW_OP_bregx.
+
 2022-06-30  Tobias Burnus  <tobias@codesourcery.com>
 
        * graphite-isl-ast-to-gimple.cc (graphite_oacc_analyze_scop): Update

diff --git a/gcc/dwarf2cfi.cc b/gcc/dwarf2cfi.cc
index 8d52622a4cbc6b14d7af5777386bfe81363ce7ee..1359280f519195af83a17079d0261b5abc7ecf24 100644 (file)
--- a/gcc/dwarf2cfi.cc
+++ b/gcc/dwarf2cfi.cc
@@ -626,7 +626,7 @@ get_cfa_from_loc_descr (dw_cfa_location *cfa, struct dw_loc_descr_node *loc)
                = (op == DW_OP_bregx
                   ? ptr->dw_loc_oprnd1.v.val_int : op - DW_OP_breg0);
              cfa->reg.set_by_dwreg (regno);
-             cfa->base_offset = (DW_OP_bregx
+             cfa->base_offset = (op == DW_OP_bregx
                                  ? ptr->dw_loc_oprnd2.v.val_int
                                  : ptr->dw_loc_oprnd1.v.val_int);
            }