Skip to content
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

Don't overwrite existing container decl scopes when parsing new sourc… #6292

Merged
merged 2 commits into from
Feb 6, 2025
Merged

Don't overwrite existing container decl scopes when parsing new sourc… #6292

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8a8db7
Don't overwrite existing module decl scopes when parsing new source f…
aleino-nv Feb 5, 2025
4c62ba5
Merge branch 'master' into aleino/visibility-bug-fix-2
aleino-nv Feb 6, 2025
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
6 changes: 5 additions & 1 deletion source/slang/slang-parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5127,7 +5127,11 @@ void Parser::parseSourceFile(ContainerDecl* program)

currentModule = getModuleDecl(program);

PushScope(program);
// If the program already has a scope, then reuse it instead of overwriting it!
if (program->ownedScope)
PushScope(program->ownedScope);
else
PushScope(program);

// A single `ModuleDecl` might span multiple source files, so it
// is possible that we are parsing a new source file into a module
Expand Down
Loading