From 2e387ef5855d533f685478cc15e3d9bea799bf30 Mon Sep 17 00:00:00 2001 From: Peter Scheibel Date: Thu, 20 Feb 2020 13:45:58 -0800 Subject: Package hashing: fix detection of directives (#14763) The hashing logic looks for function calls that are Spack directives. It expects that when a Spack directive is used that it is referenced directly by name, and that the directive function is not itself retrieved by calling another function. When the hashing logic encountered a function call where the function was determined dynamically, it would fail (attempting to access a name attribute that does not happen to exist in this case). This updates the hashing logic to filter out function calls where the function is determined dynamically when looking for uses of Spack directives. --- lib/spack/spack/test/packages.py | 4 ++++ lib/spack/spack/util/package_hash.py | 15 +++++++++++++++ 2 files changed, 19 insertions(+) (limited to 'lib') diff --git a/lib/spack/spack/test/packages.py b/lib/spack/spack/test/packages.py index c811f9040e..299c56481e 100644 --- a/lib/spack/spack/test/packages.py +++ b/lib/spack/spack/test/packages.py @@ -98,6 +98,10 @@ class TestPackage(object): assert spec1.package.content_hash(content=content1) != \ spec2.package.content_hash(content=content2) + def test_parse_dynamic_function_call(self): + spec = Spec("hash-test4").concretized() + spec.package.content_hash() + # Below tests target direct imports of spack packages from the # spack.pkg namespace def test_import_package(self): diff --git a/lib/spack/spack/util/package_hash.py b/lib/spack/spack/util/package_hash.py index f689aa9710..adea1a498b 100644 --- a/lib/spack/spack/util/package_hash.py +++ b/lib/spack/spack/util/package_hash.py @@ -41,8 +41,23 @@ class RemoveDirectives(ast.NodeTransformer): self.spec = spec def is_directive(self, node): + """Check to determine if the node is a valid directive + + Directives are assumed to be represented in the AST as a named function + call expression. This means that they will NOT be represented by a + named function call within a function call expression (e.g., as + callbacks are sometimes represented). + + Args: + node (AST): the AST node being checked + + Returns: + (bool): ``True`` if the node represents a known directive, + ``False`` otherwise + """ return (isinstance(node, ast.Expr) and node.value and isinstance(node.value, ast.Call) and + isinstance(node.value.func, ast.Name) and node.value.func.id in spack.directives.__all__) def is_spack_attr(self, node): -- cgit v1.2.3-60-g2f50