Pārlūkot izejas kodu

* Call get_high_value_sym() instead of duplicating its functionality.

git-svn-id: trunk@18914 -
sergei 14 gadi atpakaļ
vecāks
revīzija
2650326e6b
1 mainītis faili ar 4 papildinājumiem un 4 dzēšanām
  1. 4 4
      compiler/ncgutil.pas

+ 4 - 4
compiler/ncgutil.pas

@@ -1261,7 +1261,7 @@ implementation
                   a local copy }
                   a local copy }
                 if not(current_procinfo.procdef.proccalloption in cdecl_pocalls) then
                 if not(current_procinfo.procdef.proccalloption in cdecl_pocalls) then
                   begin
                   begin
-                    hsym:=tparavarsym(tsym(p).owner.Find('high'+tsym(p).name));
+                    hsym:=tparavarsym(get_high_value_sym(tparavarsym(p)));
                     if not assigned(hsym) then
                     if not assigned(hsym) then
                       internalerror(200306061);
                       internalerror(200306061);
                     hreg:=cg.getaddressregister(list);
                     hreg:=cg.getaddressregister(list);
@@ -1609,7 +1609,7 @@ implementation
                          begin
                          begin
                            { open arrays do not contain correct element count in their rtti,
                            { open arrays do not contain correct element count in their rtti,
                              the actual count must be passed separately. }
                              the actual count must be passed separately. }
-                           hsym:=tparavarsym(tsym(p).owner.Find('high'+tsym(p).name));
+                           hsym:=tparavarsym(get_high_value_sym(tparavarsym(p)));
                            eldef:=tarraydef(tparavarsym(p).vardef).elementdef;
                            eldef:=tarraydef(tparavarsym(p).vardef).elementdef;
                            if not assigned(hsym) then
                            if not assigned(hsym) then
                              internalerror(201003031);
                              internalerror(201003031);
@@ -1644,7 +1644,7 @@ implementation
                        begin
                        begin
                          if is_open_array(tparavarsym(p).vardef) then
                          if is_open_array(tparavarsym(p).vardef) then
                            begin
                            begin
-                             hsym:=tparavarsym(tsym(p).owner.Find('high'+tsym(p).name));
+                             hsym:=tparavarsym(get_high_value_sym(tparavarsym(p)));
                              eldef:=tarraydef(tparavarsym(p).vardef).elementdef;
                              eldef:=tarraydef(tparavarsym(p).vardef).elementdef;
                              if not assigned(hsym) then
                              if not assigned(hsym) then
                                internalerror(201103033);
                                internalerror(201103033);
@@ -1699,7 +1699,7 @@ implementation
               location_get_data_ref(list,tparavarsym(p).localloc,href,is_open_array(tparavarsym(p).vardef),sizeof(pint));
               location_get_data_ref(list,tparavarsym(p).localloc,href,is_open_array(tparavarsym(p).vardef),sizeof(pint));
               if is_open_array(tparavarsym(p).vardef) then
               if is_open_array(tparavarsym(p).vardef) then
                 begin
                 begin
-                  hsym:=tparavarsym(tsym(p).owner.Find('high'+tsym(p).name));
+                  hsym:=tparavarsym(get_high_value_sym(tparavarsym(p)));
                   eldef:=tarraydef(tparavarsym(p).vardef).elementdef;
                   eldef:=tarraydef(tparavarsym(p).vardef).elementdef;
                   if not assigned(hsym) then
                   if not assigned(hsym) then
                     internalerror(201003032);
                     internalerror(201003032);