From c27981c5f40ab5efccd726ef7b0a37efa508d8b2 Mon Sep 17 00:00:00 2001 From: pierre Date: Wed, 23 Sep 2020 08:53:55 +0000 Subject: [PATCH] Merge commits 46484 and 46487 to fix linux-powerpc64le snapshot generation. ------------------------------------------------------------------------ r46484 | pierre | 2020-08-18 22:52:47 +0200 (Tue, 18 Aug 2020) | 1 line Avoid internalerror 200203273 by handling LOC_CSUBSETREG and LOC_CSUBSETREF as LOC_SUBSETREG in tcgassignmentnode.pass_generate_code ------------------------------------------------------------------------ --- Merging r46484 into '.': U compiler/ncgld.pas --- Recording mergeinfo for merge of r46484 into '.': U . ------------------------------------------------------------------------ r46487 | pierre | 2020-08-18 23:58:19 +0200 (Tue, 18 Aug 2020) | 1 line Amend commit 46484: Do not accept LOC_CSUBSETREF location type as this represents read-only memory region which should never be modified ------------------------------------------------------------------------ --- Merging r46487 into '.': G compiler/ncgld.pas --- Recording mergeinfo for merge of r46487 into '.': G . git-svn-id: branches/fixes_3_2@46921 - --- compiler/ncgld.pas | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/ncgld.pas b/compiler/ncgld.pas index ca0ec04733..f964d39c44 100644 --- a/compiler/ncgld.pas +++ b/compiler/ncgld.pas @@ -1135,7 +1135,7 @@ implementation cg.g_flags2ref(current_asmdata.CurrAsmList,left.location.size,right.location.resflags,left.location.reference); cg.a_reg_dealloc(current_asmdata.CurrAsmList,NR_DEFAULTFLAGS); end; - LOC_SUBSETREG,LOC_SUBSETREF: + LOC_CSUBSETREG,LOC_SUBSETREG,LOC_SUBSETREF: begin r:=cg.getintregister(current_asmdata.CurrAsmList,left.location.size); cg.g_flags2reg(current_asmdata.CurrAsmList,left.location.size,right.location.resflags,r);