From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1729) id CF4313858000; Thu, 30 Jun 2022 23:23:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CF4313858000 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Kwok Yeung To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/omp/gcc-12] Fix mis-merge of 'dwarf: Multi-register CFI address support' X-Act-Checkin: gcc X-Git-Author: Kwok Cheung Yeung X-Git-Refname: refs/heads/devel/omp/gcc-12 X-Git-Oldrev: 82a3f9f22f74ddf63aaf65643f4d163d600c7403 X-Git-Newrev: 29ba2e4eeff0381e04a37a3c471c56cd887d2035 Message-Id: <20220630232329.CF4313858000@sourceware.org> Date: Thu, 30 Jun 2022 23:23:29 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Jun 2022 23:23:29 -0000 https://gcc.gnu.org/g:29ba2e4eeff0381e04a37a3c471c56cd887d2035 commit 29ba2e4eeff0381e04a37a3c471c56cd887d2035 Author: Kwok Cheung Yeung 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 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 + + * dwarf2cfi.cc (get_cfa_from_loc_descr): Check op against DW_OP_bregx. + 2022-06-30 Tobias Burnus * 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); }