diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/List.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/List.java
index fb295ee0f6c..ceb5614ed0f 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/List.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/List.java
@@ -419,6 +419,9 @@ public class List<A> extends AbstractCollection<A> implements java.util.List<A>
 
     @SuppressWarnings("unchecked")
     public <Z> List<Z> map(Function<A, Z> mapper) {
+        if (isEmpty()) {
+            return (List<Z>)this;
+        }
         boolean changed = false;
         ListBuffer<Z> buf = new ListBuffer<>();
         for (A a : this) {