mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-08-12 16:09:25 +02:00
* Fixed RTTI name mangling for nested types, resolves #26069.
git-svn-id: trunk@28958 -
This commit is contained in:
parent
dc4a2a59f7
commit
07ab3fbec4
1
.gitattributes
vendored
1
.gitattributes
vendored
@ -14073,6 +14073,7 @@ tests/webtbs/tw2595.pp svneol=native#text/plain
|
|||||||
tests/webtbs/tw25956.pp svneol=native#text/pascal
|
tests/webtbs/tw25956.pp svneol=native#text/pascal
|
||||||
tests/webtbs/tw25959.pp svneol=native#text/pascal
|
tests/webtbs/tw25959.pp svneol=native#text/pascal
|
||||||
tests/webtbs/tw2602.pp svneol=native#text/plain
|
tests/webtbs/tw2602.pp svneol=native#text/plain
|
||||||
|
tests/webtbs/tw26069.pp svneol=native#text/plain
|
||||||
tests/webtbs/tw2607.pp svneol=native#text/plain
|
tests/webtbs/tw2607.pp svneol=native#text/plain
|
||||||
tests/webtbs/tw26123.pp svneol=native#text/pascal
|
tests/webtbs/tw26123.pp svneol=native#text/pascal
|
||||||
tests/webtbs/tw26162.pp svneol=native#text/pascal
|
tests/webtbs/tw26162.pp svneol=native#text/pascal
|
||||||
|
@ -1777,7 +1777,7 @@ implementation
|
|||||||
end;
|
end;
|
||||||
if assigned(typesym) and
|
if assigned(typesym) and
|
||||||
(owner.symtabletype in [staticsymtable,globalsymtable]) then
|
(owner.symtabletype in [staticsymtable,globalsymtable]) then
|
||||||
result:=make_mangledname(prefix,owner,typesym.name)
|
result:=make_mangledname(prefix,typesym.owner,typesym.name)
|
||||||
else
|
else
|
||||||
result:=make_mangledname(prefix,findunitsymtable(owner),'DEF'+tostr(DefId))
|
result:=make_mangledname(prefix,findunitsymtable(owner),'DEF'+tostr(DefId))
|
||||||
end;
|
end;
|
||||||
|
23
tests/webtbs/tw26069.pp
Normal file
23
tests/webtbs/tw26069.pp
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
{ %norun }
|
||||||
|
Unit tw26069;
|
||||||
|
|
||||||
|
{$mode delphi}
|
||||||
|
|
||||||
|
Interface
|
||||||
|
|
||||||
|
Type
|
||||||
|
TClass1 = Class
|
||||||
|
Type
|
||||||
|
TReason = (rnOne, rnTwo);
|
||||||
|
End;
|
||||||
|
|
||||||
|
TClass2 = Class
|
||||||
|
Type
|
||||||
|
TReason = (rn1, rn2);
|
||||||
|
End;
|
||||||
|
|
||||||
|
|
||||||
|
Implementation
|
||||||
|
|
||||||
|
End.
|
||||||
|
|
Loading…
Reference in New Issue
Block a user