[stable] Fix Issue 21591 - missed backrefs in mangled names wrt. unmerged function types #12166
Conversation
|
Thanks for your pull request and interest in making D better, @kinke! We are looking forward to reviewing it, and you should be hearing from a maintainer soon.
Please see CONTRIBUTING.md for more information. If you have addressed all reviews or aren't sure how to proceed, don't hesitate to ping us with a simple comment. Bugzilla references
Testing this PR locallyIf you don't have a local development environment setup, you can use Digger to test this PR: dub run digger -- build "stable + dmd#12166" |
src/dmd/dmangle.d
Outdated
| * passed to `mangleToBuffer()`: `rootType` | ||
| */ | ||
| if (t != rootType && t.isTypeFunction()) | ||
| t = t.merge2(); |
There was a problem hiding this comment.
Pinging @rainers. I've also tried if (t.deco && t.isTypeFunction()) which worked in my case too and wouldn't require this ugly rootType field; I'm not sure whether it would be reliable though...
There was a problem hiding this comment.
Is it actually possible to have a function type refer to itself? How would you declare that? Or is the rootType test just triggering for erroneous type declarations?
There was a problem hiding this comment.
I don't think it's possible; it's just there to prevent an infinite recursion in case the deco hasn't been computed yet and merge2() calls mangleToBuffer(tf), where we end up in here again.
kinke
force-pushed
the
tf_mangle
branch
4 times, most recently
from
13d399a
to
007b25b
Compare
kinke
force-pushed
the
tf_mangle
branch
5 times, most recently
from
74302e8
to
09ebd8a
Compare
| void function() fn3(void function()**, void function()*); | ||
| F fr3(F**, F*); | ||
| static assert(fn3.mangleof == "_D9test215913fn3FPPPFZvQfZQh"); | ||
| static assert(fr3.mangleof == "_D9test215913fr3FPPPFZvQfZQh"); |
There was a problem hiding this comment.
This 'reference' mangle changes as well; previously, the return type wasn't backref'd (_D9test215913fr3FPPPFZvQfZPFZv).
…tion types TypeFunctions are apparently special and not merged, so make sure to use the generic merged function type as backref cache key. Unfortunately, this requires special care to prevent an infinite recursion, as merging is based on mangling.
| void function()** fn4(ref void function(), ref void function()*); | ||
| F** fr4(ref F, ref F*); | ||
| static assert(fn4.mangleof == "_D9test215913fn4FKPFZvKPQgZPQf"); | ||
| static assert(fr4.mangleof == "_D9test215913fr4FKPFZvKPQgZPQf"); |
There was a problem hiding this comment.
This one too (2nd param wasn't backref'd: _D9test215913fr4FKPFZvKPPFZvZPQh).
RazvanN7
added
the
72h no objection -> merge
|
@MartinNowak: Please include this in v2.095.1-beta1, this bug is preventing Symmetry from bumping the compilers to v2.095. :) |
TypeFunctionsare apparently special and not merged (see #1102), so make sure to use the generic merged function type as backref cache key.Unfortunately, this requires special care to prevent an infinite recursion, as merging is based on mangling.