mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-23 07:28:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmMakefile: Allow arbitrary stack manipulation

Browse Source 
Create a helper class to allow insertion of arbitrary entries into the
call stack (i.e. not associated with ExecuteCommand, ReadDependentFile,
etc.). Refactor ExecuteCommand helper class to leverage this and to be
named more consistently with similar helpers.
This commit is contained in:
Matthew Woehlke
2024-12-04 11:57:34 -05:00
committed by Brad King
parent de5700a15a
commit a73955ae76
2 changed files with 80 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
Source/cmMakefile.cxx
View File

@@ -400,20 +400,59 @@ void cmMakefile::PrintCommandTrace(cmListFileFunction const& lff,
}
}
cmMakefile::CallRAII::CallRAII(cmMakefile* mf, std::string const& file,
cmExecutionStatus& status)
: CallRAII(mf, cmListFileContext::FromListFilePath(file), status)
{
}
cmMakefile::CallRAII::CallRAII(cmMakefile* mf, const cmListFileContext& lfc,
cmExecutionStatus& status)
: Makefile{ mf }
{
this->Makefile->Backtrace = this->Makefile->Backtrace.Push(lfc);
++this->Makefile->RecursionDepth;
this->Makefile->ExecutionStatusStack.push_back(&status);
}
cmMakefile::CallRAII::~CallRAII()
{
if (this->Makefile) {
this->Detach();
}
}
cmMakefile* cmMakefile::CallRAII::Detach()
{
assert(this->Makefile);
this->Makefile->ExecutionStatusStack.pop_back();
--this->Makefile->RecursionDepth;
this->Makefile->Backtrace = this->Makefile->Backtrace.Pop();
auto* const mf = this->Makefile;
this->Makefile = nullptr;
return mf;
}
// Helper class to make sure the call stack is valid.
class cmMakefileCall
class cmMakefile::CallScope : public CallRAII
{
public:
cmMakefileCall(cmMakefile* mf, cmListFileFunction const& lff,
cm::optional<std::string> deferId, cmExecutionStatus& status)
: Makefile(mf)
CallScope(cmMakefile* mf, cmListFileFunction const& lff,
cm::optional<std::string> deferId, cmExecutionStatus& status)
: CallScope{ mf, lff,
cmListFileContext::FromListFileFunction(
lff, mf->StateSnapshot.GetExecutionListFile(),
std::move(deferId)),
status }
{
}
CallScope(cmMakefile* mf, cmListFileFunction const& lff,
cmListFileContext const& lfc, cmExecutionStatus& status)
: CallRAII{ mf, lfc, status }
{
cmListFileContext const& lfc = cmListFileContext::FromListFileFunction(
lff, this->Makefile->StateSnapshot.GetExecutionListFile(),
std::move(deferId));
this->Makefile->Backtrace = this->Makefile->Backtrace.Push(lfc);
++this->Makefile->RecursionDepth;
this->Makefile->ExecutionStatusStack.push_back(&status);
#if !defined(CMAKE_BOOTSTRAP)
this->ProfilingDataRAII =
this->Makefile->GetCMakeInstance()->CreateProfilingEntry(
@@ -440,28 +479,25 @@ public:
#endif
}
~cmMakefileCall()
~CallScope()
{
#if !defined(CMAKE_BOOTSTRAP)
this->ProfilingDataRAII.reset();
#endif
this->Makefile->ExecutionStatusStack.pop_back();
--this->Makefile->RecursionDepth;
this->Makefile->Backtrace = this->Makefile->Backtrace.Pop();
auto* const mf = this->Detach();
#ifdef CMake_ENABLE_DEBUGGER
if (this->Makefile->GetCMakeInstance()->GetDebugAdapter()) {
this->Makefile->GetCMakeInstance()
->GetDebugAdapter()
->OnEndFunctionCall();
if (mf->GetCMakeInstance()->GetDebugAdapter()) {
mf->GetCMakeInstance()->GetDebugAdapter()->OnEndFunctionCall();
}
#else
static_cast<void>(mf);
#endif
}
cmMakefileCall(const cmMakefileCall&) = delete;
cmMakefileCall& operator=(const cmMakefileCall&) = delete;
CallScope(const CallScope&) = delete;
CallScope& operator=(const CallScope&) = delete;
private:
cmMakefile* Makefile;
#if !defined(CMAKE_BOOTSTRAP)
cm::optional<cmMakefileProfilingData::RAII> ProfilingDataRAII;
#endif
@@ -485,7 +521,7 @@ bool cmMakefile::ExecuteCommand(const cmListFileFunction& lff,
}
// Place this call on the call stack.
cmMakefileCall stack_manager(this, lff, std::move(deferId), status);
CallScope stack_manager(this, lff, std::move(deferId), status);
static_cast<void>(stack_manager);
// Check for maximum recursion depth.

23
Source/cmMakefile.h
View File

@@ -1072,6 +1072,25 @@ public:
DebugFindPkgRAII& operator=(DebugFindPkgRAII const&) = delete;
};
class CallRAII
{
public:
CallRAII(cmMakefile* mf, std::string const& file,
cmExecutionStatus& status);
~CallRAII();
CallRAII(CallRAII const&) = delete;
CallRAII& operator=(CallRAII const&) = delete;
protected:
CallRAII(cmMakefile* mf, cmListFileContext const& lfc,
cmExecutionStatus& status);
cmMakefile* Detach();
cmMakefile* Makefile;
};
bool GetDebugFindPkgMode() const;
void MaybeWarnCMP0074(std::string const& rootVar, cmValue rootDef,
@@ -1201,8 +1220,10 @@ private:
std::vector<std::unique_ptr<cmGeneratorExpressionEvaluationFile>>
EvaluationFiles;
class CallScope;
friend class CallScope;
std::vector<cmExecutionStatus*> ExecutionStatusStack;
friend class cmMakefileCall;
friend class cmParseFileScope;
std::vector<std::unique_ptr<cmTarget>> ImportedTargetsOwned;