Merge branch 'master' into topic/grossag/compoundactionscan

1 files changed, 16 insertions, 6 deletions

diff --git a/src/engine/SCons/Node/Python.py b/src/engine/SCons/Node/Python.py
index a5bcd4b..68c6ee8 100644
--- a/src/engine/SCons/Node/Python.py
+++ b/src/engine/SCons/Node/Python.py
@@ -88,7 +88,7 @@ class Value(SCons.Node.Node):
     NodeInfo = ValueNodeInfo
     BuildInfo = ValueBuildInfo
 
-    def __init__(self, value, built_value=None):
+    def __init__(self, value, built_value=None, name=None):
         SCons.Node.Node.__init__(self)
         self.value = value
         self.changed_since_last_build = 6
@@ -96,6 +96,13 @@ class Value(SCons.Node.Node):
         if built_value is not None:
             self.built_value = built_value
 
+        # Set a name so it can be a child of a node and not break
+        # its parent's implementation of Node.get_contents.
+        if name:
+            self.name = name
+        else:
+            self.name = str(value)
+
     def str_for_display(self):
         return repr(self.value)
 
@@ -177,23 +184,26 @@ class Value(SCons.Node.Node):
         return contents
 
 
-def ValueWithMemo(value, built_value=None):
+def ValueWithMemo(value, built_value=None, name=None):
+    """
+    Memoized Value() node factory.
+    """
     global _memo_lookup_map
 
     # No current support for memoizing a value that needs to be built.
     if built_value:
-        return Value(value, built_value)
+        return Value(value, built_value, name=name)
 
     try:
-        memo_lookup_key = hash(value)
+        memo_lookup_key = hash((value, name))
     except TypeError:
         # Non-primitive types will hit this codepath.
-        return Value(value)
+        return Value(value, name=name)
 
     try:
         return _memo_lookup_map[memo_lookup_key]
     except KeyError:
-        v = Value(value)
+        v = Value(value, built_value, name)
         _memo_lookup_map[memo_lookup_key] = v
         return v