zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spec: fix infinite recursion when computing package hash

Browse Source 
Issue described in the following PR comment:

https://github.com/spack/spack/pull/28504#issuecomment-1051835568

Solution described in subsequent comment:

https://github.com/spack/spack/pull/28504#issuecomment-1053986132
This commit is contained in:
Scott Wittenburg
2022-02-28 12:46:30 -07:00
committed by Todd Gamblin
parent cb0d12b9d5
commit 84cfb3b7fe
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/spack/spack/spec.py
View File

@@ -1823,6 +1823,10 @@ def dag_hash_bit_prefix(self, bits):
"""Get the first <bits> bits of the DAG hash as an integer type.""" """Get the first <bits> bits of the DAG hash as an integer type."""
return spack.util.hash.base32_prefix_bits(self.dag_hash(), bits) return spack.util.hash.base32_prefix_bits(self.dag_hash(), bits)
def process_hash_bit_prefix(self, bits):
"""Get the first <bits> bits of the DAG hash as an integer type."""
return spack.util.hash.base32_prefix_bits(self.process_hash(), bits)
def to_node_dict(self, hash=ht.dag_hash): def to_node_dict(self, hash=ht.dag_hash):
"""Create a dictionary representing the state of this Spec. """Create a dictionary representing the state of this Spec.
@@ -4737,14 +4741,18 @@ def clear_cached_hashes(self, ignore=()):
self._dunder_hash = None self._dunder_hash = None
def __hash__(self): def __hash__(self):
# If the spec is concrete, we leverage the DAG hash and just use # If the spec is concrete, we leverage the process hash and just use
# a 64-bit prefix of it. The DAG hash has the advantage that it's # a 64-bit prefix of it. The process hash has the advantage that it's
# computed once per concrete spec, and it's saved -- so if we # computed once per concrete spec, and it's saved -- so if we read
# read concrete specs we don't need to recompute the whole hash. # concrete specs we don't need to recompute the whole hash. This is
# This is good for large, unchanging specs. # good for large, unchanging specs.
#
# We use the process hash instead of the DAG hash here because the DAG
# hash includes the package hash, which can cause infinite recursion,
# and which isn't defined unless the spec has a known package.
if self.concrete: if self.concrete:
if not self._dunder_hash: if not self._dunder_hash:
self._dunder_hash = self.dag_hash_bit_prefix(64) self._dunder_hash = self.process_hash_bit_prefix(64)
return self._dunder_hash return self._dunder_hash
# This is the normal hash for lazy_lexicographic_ordering. It's # This is the normal hash for lazy_lexicographic_ordering. It's