From: Kwok Cheung Yeung <kcy@codesourcery.com>
Date: Thu, 30 Jun 2022 15:49:15 +0000 (+0100)
Subject: Fix mis-merge of 'dwarf: Multi-register CFI address support'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29ba2e4eeff0381e04a37a3c471c56cd887d2035;p=thirdparty%2Fgcc.git

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 af922a6cb1e7..24e22e19ae8b 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 8d52622a4cbc..1359280f5191 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);
 	    }