1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/Type.java b/src/main/java/com/google/devtools/build/lib/syntax/Type.java
index a3d348cd9d..342c9006e1 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/Type.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/Type.java
@@ -622,7 +622,8 @@ public abstract class Type<T> {
       } else if (x instanceof List) {
         return (List<Object>) x;
       } else if (x instanceof Iterable) {
-        return ImmutableList.copyOf((Iterable<?>) x);
+        // Do not remove <Object>: workaround for Java 7 type inference.
+        return ImmutableList.<Object>copyOf((Iterable<?>) x);
       } else {
         throw new ConversionException(this, x, what);
       }