-- Zusammenführen von r39934 in ».«:

U    compiler/defcmp.pas
U    compiler/node.pas
U    compiler/pexpr.pas
A    tests/webtbs/tw34037.pp
-- Aufzeichnung der Informationen für Zusammenführung von r39934 in ».«:
 U   .

git-svn-id: branches/fixes_3_2@47421 -

.gitattributes

@@ -17588,6 +17588,7 @@ tests/webtbs/tw33898.pp -text svneol=native#text/pascal
 tests/webtbs/tw33963.pp svneol=native#text/pascal
 tests/webtbs/tw3402.pp svneol=native#text/plain
 tests/webtbs/tw34021.pp -text svneol=native#text/pascal
+tests/webtbs/tw34037.pp svneol=native#text/pascal
 tests/webtbs/tw34055.pp svneol=native#text/plain
 tests/webtbs/tw3411.pp svneol=native#text/plain
 tests/webtbs/tw34124.pp svneol=native#text/pascal

compiler/defcmp.pas

@@ -289,7 +289,8 @@ implementation
              if assigned(tstoreddef(def_from).genconstraintdata) or
                  assigned(tstoreddef(def_to).genconstraintdata) then
                begin
-                 if def_from.typ<>def_to.typ then
+                 { constants could get another deftype (e.g. niln) }
+                 if (def_from.typ<>def_to.typ) and not(fromtreetype in nodetype_const) then
                    begin
                      { not compatible anyway }
                      doconv:=tc_not_possible;

compiler/node.pas

@@ -195,11 +195,13 @@ interface
           'specializen');
 
       { a set containing all const nodes }
-      nodetype_const = [ordconstn,
+      nodetype_const = [niln,
+                        ordconstn,
                         pointerconstn,
                         stringconstn,
                         guidconstn,
-                        realconstn];
+                        realconstn,
+                        setconstn];
 
     type
        { all boolean field of ttree are now collected in flags }
@@ -657,7 +659,7 @@ implementation
 
     function is_constnode(p : tnode) : boolean;
       begin
-        is_constnode:=(p.nodetype in [niln,ordconstn,realconstn,stringconstn,setconstn,pointerconstn,guidconstn]);
+        is_constnode:=(p.nodetype in nodetype_const);
       end;
 
 

compiler/pexpr.pas

@@ -1974,7 +1974,7 @@ implementation
                       not is_objectpascal_helper(tdef(srsymtable.defowner)) then
                     internalerror(2013011401);
                   { convert const node to temp node of the extended type }
-                  if node.nodetype in (nodetype_const+[niln,addrn]) then
+                  if node.nodetype in (nodetype_const+[addrn]) then
                     begin
                       extdef:=tobjectdef(srsymtable.defowner).extendeddef;
                       newstatement:=nil;

tests/webtbs/tw34037.pp

@@ -0,0 +1,21 @@
+program project1;
+{$mode objfpc}{$H+}
+
+uses
+  Classes, FGL;
+
+type
+  TBaseClass = class (TObject)
+  end;
+
+  generic TFPGObjectListEx<T: TBaseClass> = class (specialize TFPGObjectList<T>)
+    function GetItemByID(AID: Integer): T;
+  end;
+
+function TFPGObjectListEx.GetItemByID(AID: Integer): T;
+begin
+  Result:=nil; //T(nil);
+end;
+
+begin
+end.