[gcc/devel/omp/gcc-12] Fix mis-merge of 'dwarf: Multi-register CFI address support'

[gcc/devel/omp/gcc-12] Fix mis-merge of 'dwarf: Multi-register CFI address support'

[Kwok Yeung]

https://gcc.gnu.org/g:29ba2e4eeff0381e04a37a3c471c56cd887d2035

commit 29ba2e4eeff0381e04a37a3c471c56cd887d2035
Author: Kwok Cheung Yeung <kcy@codesourcery.com>
Date:   Thu Jun 30 16:49:15 2022 +0100

    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:
---
 gcc/ChangeLog.omp | 4 ++++
 gcc/dwarf2cfi.cc  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/gcc/ChangeLog.omp b/gcc/ChangeLog.omp
index af922a6cb1e..24e22e19ae8 100644
--- 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 8d52622a4cb..1359280f519 100644
--- 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);
 	    }