--- Merging r29485 into '.':

A    tests/test/tgeneric98.pp
U    compiler/ptype.pas
--- Recording mergeinfo for merge of r29485 into '.':
 U   .

# revisions: 29485

git-svn-id: branches/fixes_3_0@31270 -

.gitattributes

@@ -11737,6 +11737,7 @@ tests/test/tgeneric94.pp svneol=native#text/pascal
 tests/test/tgeneric95.pp svneol=native#text/pascal
 tests/test/tgeneric96.pp svneol=native#text/pascal
 tests/test/tgeneric97.pp svneol=native#text/pascal
+tests/test/tgeneric98.pp svneol=native#text/pascal
 tests/test/tgoto.pp svneol=native#text/plain
 tests/test/theap.pp svneol=native#text/plain
 tests/test/theapthread.pp svneol=native#text/plain

compiler/ptype.pas

@@ -340,7 +340,11 @@ implementation
             ((ttypesym(srsym).typedef.typ=errordef) or
             (not allowgenericsyms and
             (ttypesym(srsym).typedef.typ=undefineddef) and
-            not (sp_generic_para in srsym.symoptions))) then
+            not (sp_generic_para in srsym.symoptions) and
+            not (sp_explicitrename in srsym.symoptions) and
+            not assigned(srsym.owner.defowner) and
+            { use df_generic instead of is_generic to allow aliases in nested types as well }
+            not (df_generic in tstoreddef(srsym.owner.defowner).defoptions))) then
           begin
             Message1(type_e_type_is_not_completly_defined,ttypesym(srsym).realname);
             def:=generrordef;

tests/test/tgeneric98.pp

@@ -0,0 +1,50 @@
+{ %NORUN }
+
+program tgeneric98;
+
+{$mode objfpc}
+
+type
+  generic TTest<T> = class
+  public type
+    TAlias = T;
+  private
+    fField: TAlias;
+    procedure SetField(aValue: TAlias);
+  public
+    property Field: TAlias read fField write SetField;
+    function CalcField: TAlias;
+  end;
+
+  generic TTest2<T> = class
+  public type
+    TTestT = specialize TTest<T>;
+  private
+    fField: TTestT.TAlias;
+    procedure SetField(aValue: TTestT.TAlias);
+  public
+    property Field: TTestT.TAlias read fField write SetField;
+    function CalcField: TTestT.TAlias;
+  end;
+
+procedure TTest.SetField(aValue: TAlias);
+begin
+end;
+
+function TTest.CalcField: TAlias;
+begin
+  Result := Default(TAlias);
+end;
+
+procedure TTest2.SetField(aValue: TTestT.TAlias);
+begin
+end;
+
+function TTest2.CalcField: TTestT.TAlias;
+begin
+  Result := Default(TTestT.TAlias);
+end;
+
+begin
+
+end.