Selaa lähdekoodia

Another system, another regression... (this time tests/test/tgenfunc15.pp on i386-win32)

pgenutil.pas:
  * generate_specialization_phase2 & generate_specialization_procs: don't add pending specializations if we're currently parsing a generic

git-svn-id: trunk@33885 -
svenbarth 9 vuotta sitten
vanhempi
commit
6c3dd6b601
1 muutettua tiedostoa jossa 3 lisäystä ja 1 poistoa
  1. 3 1
      compiler/pgenutil.pas

+ 3 - 1
compiler/pgenutil.pas

@@ -1076,7 +1076,7 @@ uses
             specialization_done(state);
 
             { procdefs are only added once we know which overload we use }
-            if result.typ<>procdef then
+            if not parse_generic and (result.typ<>procdef) then
               current_module.pendingspecializations.add(result.typename,result);
           end;
 
@@ -1657,6 +1657,8 @@ uses
         hmodule : tmodule;
         st : tsymtable;
       begin
+        if parse_generic then
+          exit;
         st:=def.owner;
         while st.symtabletype in [localsymtable] do
           st:=st.defowner.owner;