Go: Fix missing promoted fields due to name clash #18001
Conversation
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
|
Hmm, the tests pass locally for me. I'll have to look into that more. |
owen-mc
force-pushed
the
go/fix/missing-promoted-fields
branch
from
7c51705
to
85a19e8
Compare
NCField should be promoted to EmbedsNameClash. Currently it isn't because its embedded parent pkg2.NameClash is not a promoted field in EmbedsNameClash (because of a name clash with pkg1.NameClash), but this should not make a difference.
owen-mc
force-pushed
the
go/fix/missing-promoted-fields
branch
from
2547c83
to
4a05c3d
Compare
|
I figured it out. I was using the released CLI, but #17941 changes the extractor and hence the test results, so I needed to build and use the go extractor locally. This is ready to review now. |
There was a problem hiding this comment.
Haven't reviewed the tests in detail, but I'm 99% convinced the elimination of getFieldCand vs hasFieldCand is sound. One difference jumps out: getFieldCand uses hasEmbeddedField which doesn't look through a NamedType before using .(PointerType).getBaseType(), getFieldOfEmbedded does. This might make a difference if X is embedded where X is defined type X *Y, in a positive direction. I note hasMethodCand uses this embedded-field predicate as well.
Definitely needs DCA.
|
Note that |
When two embedded fields at different depths have the same name (but are not the same type - they are in different packages and happen to have the same name) then we don't treat the second one correctly and we don't promote any of its fields or methods. This turns out to be because of a condition that was added to avoid non-termination on cyclic structs in github/codeql-go#184 which only checked the name of the embedded field. The fix is to also check the type.
While looking into this I noticed that we have two different predicates for calculating field candidates. This PR includes a refactoring to remove the redundancy and make the code easier to understand.