Skip to content

Place CPython thread types in their defining header’s Go file #925

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xushiwei merged 5 commits into from
Oct 5, 2026
+16 −6
Merged

Place CPython thread types in their defining header’s Go file #925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
518befb
Initial plan
Copilot Oct 5, 2026
3c61401
fix(tool): emit CPython thread type with its definition
Copilot Oct 5, 2026
63e7a27
Apply remaining changes
Copilot Oct 5, 2026
eea6704
restore LLVM fixture dependencies
Copilot Oct 5, 2026
9b67a2e
remove installer-generated module changes
Copilot Oct 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions cl/compile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (

"github.com/goplus/gogen"
"github.com/goplus/llcppg/clang"
lc "github.com/llarhub/clang-c"
)

const (
Expand Down Expand Up @@ -286,6 +287,14 @@ func loadFiles(ctx *pkgCtx, files []Source, myPkgPath string, goFileOf func(head
clang.VisitChildren(f.Cursor(), func(decl, parent clang.Cursor) clang.ChildVisitResult {
if pkgOf != nil {
at := clang.PresumedFile(decl.Location())
switch decl.Kind {
case lc.Cursor_ClassDecl, lc.Cursor_StructDecl:
Comment on lines +290 to +291

@fennoai fennoai Bot Oct 5, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[P2] Same forward-decl misattribution likely applies to enum/union

This switch only special-cases Cursor_ClassDecl/Cursor_StructDecl. Enum and union declarations short-circuit on the exact same condition elsewhere (enum.go:65 and union.go:67 both do if decl.IsCursorDefinition() == 0 { return }), so an enum/union forward-declared in file A and defined in file B can be attributed to the wrong file by the same mechanism this PR fixes for class/struct. Enum forward declarations with a fixed underlying type (enum E : int;) are legal and common C++11.

If the broader fix is intended, consider also handling lc.Cursor_EnumDecl (and lc.Cursor_UnionDecl). If class/struct is the deliberate scope, a short comment explaining why would prevent a future reader from assuming it was an oversight. (Typedefs are correctly excluded — they are not a forward/definition pair.)

if decl.IsCursorDefinition() == 0 {
if definition := decl.Definition(); definition.IsNull() == 0 {
Comment thread
xushiwei marked this conversation as resolved.
at = clang.PresumedFile(definition.Location())
}
}
}
if _, ok := lastSeen[at]; ok {
return clang.Continue // already loaded
}
Expand Down
9 changes: 7 additions & 2 deletions tool/_testc/python-3.14.8/cpython-pythread.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions tool/_testc/python-3.14.8/pythread.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading