2
0
Эх сурвалжийг харах

--- Merging r30239 into '.':
U compiler/x86_64/cpupara.pas
A tests/webtbs/tw27658.pp
--- Recording mergeinfo for merge of r30239 into '.':
U .

# revisions: 30239

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

marco 10 жил өмнө
parent
commit
ad937e79fa

+ 1 - 0
.gitattributes

@@ -14246,6 +14246,7 @@ tests/webtbs/tw27424.pp svneol=native#text/pascal
 tests/webtbs/tw2758.pp svneol=native#text/plain
 tests/webtbs/tw2763.pp svneol=native#text/plain
 tests/webtbs/tw2765.pp svneol=native#text/plain
+tests/webtbs/tw27658.pp svneol=native#text/pascal
 tests/webtbs/tw2767.pp svneol=native#text/plain
 tests/webtbs/tw2771.pp svneol=native#text/plain
 tests/webtbs/tw2772.pp svneol=native#text/plain

+ 5 - 0
compiler/x86_64/cpupara.pas

@@ -705,6 +705,11 @@ unit cpupara;
               def:=search_system_type('TVARDATA').typedef;
               result:=classify_argument(def,varspez,def.size,classes,byte_offset);
             end;
+          undefineddef:
+            { show shall we know?
+              since classify_argument is called during parsing, see tw27685.pp,
+              we handle undefineddef here }
+            result:=0;
           else
             internalerror(2010021405);
         end;

+ 14 - 0
tests/webtbs/tw27658.pp

@@ -0,0 +1,14 @@
+{$MODE OBJFPC}
+program Project1;
+
+uses gmap;
+
+type
+
+generic TMyMap <TKey, TValue, TCompare> = class(specialize TMap<TKey, TValue, TCompare>)
+end;
+generic TMyCounter <TKey, TCompare> = class(specialize TMyMap<TKey, SizeUInt, TCompare>)
+end;
+
+begin
+end.