commit a8094a8c86876aa26eb3d02aafd792bcda3c3850
author Damien Martin-Guillerez <dmarting@google.com> Wed May 13 12:40:23 2015 +0000
committer Damien Martin-Guillerez <dmarting@google.com> Fri May 15 09:43:26 2015 +0000
tree 3185e3252881501b9095073258a828dafcec5cc3
parent a7f4851146fb41ca03f294d74a93dcde005906ee

Use a LinkedHashMap do the addition of dictionnaries

Previously, the resulting map was using a HashMap as an intermediate
map to construct the final map then converted to an ImmutableMap.
HashMap iteration or is non-deterministic and can even vary between
execution of the same binary.

--
MOS_MIGRATED_REVID=93512467

src/main/java/com/google/devtools/build/lib/syntax/BinaryOperatorExpression.java

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/BinaryOperatorExpression.java b/src/main/java/com/google/devtools/build/lib/syntax/BinaryOperatorExpression.java
index 3d6b593a..ff7c322 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/BinaryOperatorExpression.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/BinaryOperatorExpression.java
@@ -300,7 +300,8 @@
     if (lval instanceof Map<?, ?> && rval instanceof Map<?, ?>) {
       Map<?, ?> ldict = (Map<?, ?>) lval;
       Map<?, ?> rdict = (Map<?, ?>) rval;
-      Map<Object, Object> result = Maps.newHashMapWithExpectedSize(ldict.size() + rdict.size());
+      Map<Object, Object> result =
+          Maps.newLinkedHashMapWithExpectedSize(ldict.size() + rdict.size());
       result.putAll(ldict);
       result.putAll(rdict);
       return ImmutableMap.copyOf(result);