maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(3p/nix/libexpr): Use absl::btree_map for AttrSets

Browse source 
This is the first step towards replacing the implementation of
attribute sets with an absl::btree_map.

Currently many access are done using array offsets and pointer
arithmetic, so this change is currently causing Nix to fail in various
ways.
This commit is contained in:
Vincent Ambo 2020-05-21 19:20:24 +01:00
parent 1bb9cd7749
commit 28e347effe
6 changed files with 95 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

2
third_party/nix/src/libexpr/nixexpr.cc vendored
View file

@ -285,7 +285,7 @@ void ExprOpHasAttr::bindVars(const StaticEnv& env) {
void ExprAttrs::bindVars(const StaticEnv& env) {
const StaticEnv* dynamicEnv = &env;
StaticEnv newEnv(false, &env);
StaticEnv newEnv(/* isWith = */ false, &env);
if (recursive) {
dynamicEnv = &newEnv;