This patch series fixes name resolution within expanded macro calls and with call arguments. The first patch is same as in v1. Patches 2-4 replace patch 2 in v1. The original way of fixing name resolution of call arguments did not work if a disabled optional forced a reset. Patch 5 is the same as patch 3 in v1. James Carter (5): libsepol/cil: Make name resolution in macros work as documented libsepol/cil: Do not add NULL node when inserting key into symtab libsepo/cil: Refactor macro call resolution libsepol/cil: Do not resolve arguments to declarations in the call secilc/docs: Relocate and reword macro call name resolution order libsepol/cil/src/cil_internal.h | 1 - libsepol/cil/src/cil_resolve_ast.c | 635 ++++++++++++----------- libsepol/cil/src/cil_symtab.c | 8 +- secilc/docs/cil_call_macro_statements.md | 24 +- 4 files changed, 354 insertions(+), 314 deletions(-) -- 2.26.3