Browse Source

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 -
pierre 4 years ago
parent
commit
c27981c5f4
1 changed files with 1 additions and 1 deletions
  1. 1 1
      compiler/ncgld.pas

+ 1 - 1
compiler/ncgld.pas

@@ -1135,7 +1135,7 @@ implementation
                               cg.g_flags2ref(current_asmdata.CurrAsmList,left.location.size,right.location.resflags,left.location.reference);
                               cg.g_flags2ref(current_asmdata.CurrAsmList,left.location.size,right.location.resflags,left.location.reference);
                               cg.a_reg_dealloc(current_asmdata.CurrAsmList,NR_DEFAULTFLAGS);
                               cg.a_reg_dealloc(current_asmdata.CurrAsmList,NR_DEFAULTFLAGS);
                             end;
                             end;
-                        LOC_SUBSETREG,LOC_SUBSETREF:
+                        LOC_CSUBSETREG,LOC_SUBSETREG,LOC_SUBSETREF:
                           begin
                           begin
                             r:=cg.getintregister(current_asmdata.CurrAsmList,left.location.size);
                             r:=cg.getintregister(current_asmdata.CurrAsmList,left.location.size);
                             cg.g_flags2reg(current_asmdata.CurrAsmList,left.location.size,right.location.resflags,r);
                             cg.g_flags2reg(current_asmdata.CurrAsmList,left.location.size,right.location.resflags,r);