dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-08 16:50:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

block: Fix incorrect policy scope creation order

Browse Source 
Creates the policy scope after the variable scope instead of the other
way round. This ensures that the cmStateSnapshot which the policy is
registered to is the same as the one created with the variable scope so
that reading a policy from the parent snapshot does not incorrectly read
policies from the new snapshot.
This commit is contained in:
Arha Gatram
2026-06-25 16:36:02 -07:00
committed by Brad King
parent 5190a9d88e
commit 220fc8622d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmBlockCommand.cxx
View File

@@ -40,19 +40,19 @@ public:
BlockScopePushPop& operator=(BlockScopePushPop const&) = delete;
private:
std::unique_ptr<cmMakefile::PolicyPushPop> PolicyScope;
std::unique_ptr<cmMakefile::VariablePushPop> VariableScope;
std::unique_ptr<cmMakefile::PolicyPushPop> PolicyScope;
std::unique_ptr<cmMakefile::DiagnosticPushPop> DiagnosticScope;
};
BlockScopePushPop::BlockScopePushPop(cmMakefile* mf, ScopeSet const& scopes)
{
if (scopes.contains(ScopeType::POLICIES)) {
this->PolicyScope = cm::make_unique<cmMakefile::PolicyPushPop>(mf);
}
if (scopes.contains(ScopeType::VARIABLES)) {
this->VariableScope = cm::make_unique<cmMakefile::VariablePushPop>(mf);
}
if (scopes.contains(ScopeType::POLICIES)) {
this->PolicyScope = cm::make_unique<cmMakefile::PolicyPushPop>(mf);
}
if (scopes.contains(ScopeType::DIAGNOSTICS)) {
this->DiagnosticScope = cm::make_unique<cmMakefile::DiagnosticPushPop>(mf);
}