diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-05-17 13:37:41 +0200 |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-05-19 22:36:53 +0200 |
| commit | 2b09d9f346bd3220b059771a6da1bafb06ce0f5b (patch) | |
| tree | aa6531a7fec1d25ca329a8dc8a01bd169c231734 /Source/cmDefinitions.h | |
| parent | 528d68021c6769b2aa86ea9751a7308a84101ca2 (diff) | |
| download | cmake-2b09d9f346bd3220b059771a6da1bafb06ce0f5b.tar.gz | |
cmMakefile: Remove VarInitStack.
In cmMakefile::PushScope, a copy of the closure of keys initialized
in the parent scope is made. In PopScope, essentially the same copy
is inserted back into the parent. That means a lot of duplication
of strings and a lot of string comparisons. None of it is needed,
because the cmDefinitions keys already provide a canonical
representation of what is initialized.
The removal of the separate container also makes the variable handling
code more easy to reason about in general.
Before this patch, configuring llvm uses 200 KiB for the VarInitStack.
Overall peak memory consumption goes from 35.5 MiB to 35.1 MiB.
Diffstat (limited to 'Source/cmDefinitions.h')
| -rw-r--r-- | Source/cmDefinitions.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/cmDefinitions.h b/Source/cmDefinitions.h index 894ff7a028..bd3d392fcf 100644 --- a/Source/cmDefinitions.h +++ b/Source/cmDefinitions.h @@ -40,6 +40,9 @@ public: static void Raise(const std::string& key, StackIter begin, StackIter end); + static bool HasKey(const std::string& key, + StackConstIter begin, StackConstIter end); + /** Set (or unset if null) a value associated with a key. */ void Set(const std::string& key, const char* value); |