Преглед изворни кода

* also check for nf_assign_done_in_right flag after typechecking the right side

git-svn-id: trunk@39118 -
svenbarth пре 7 година
родитељ
комит
85439a0fa0
1 измењених фајлова са 8 додато и 0 уклоњено
  1. 8 0
      compiler/nld.pas

+ 8 - 0
compiler/nld.pas

@@ -596,6 +596,14 @@ implementation
         if codegenerror then
         if codegenerror then
           exit;
           exit;
 
 
+        { just in case the typecheckpass of right optimized something here }
+        if nf_assign_done_in_right in flags then
+          begin
+            result:=right;
+            right:=nil;
+            exit;
+          end;
+
         { tp procvar support, when we don't expect a procvar
         { tp procvar support, when we don't expect a procvar
           then we need to call the procvar }
           then we need to call the procvar }
         if (left.resultdef.typ<>procvardef) then
         if (left.resultdef.typ<>procvardef) then