From c74f4dfd855ff797fa7f914f5195017cf54bb976 Mon Sep 17 00:00:00 2001
From: Ivan Trubach <mr.trubach@icloud.com>
Date: Thu, 8 Aug 2019 22:24:39 +0300
Subject: [PATCH] go/ast: fix ast.MergePackageFiles iteration order

This commit changes ast.MergePackageFiles to iterate over imports
in the same order when ast.FilterImportDuplicates mode is disabled.
---
 src/go/ast/filter.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/go/ast/filter.go b/src/go/ast/filter.go
index 2be30d2fb4..1f2cab222f 100644
--- a/src/go/ast/filter.go
+++ b/src/go/ast/filter.go
@@ -474,7 +474,8 @@ func MergePackageFiles(pkg *Package, mode MergeMode) *File {
 			}
 		}
 	} else {
-		for _, f := range pkg.Files {
+		for _, filename := range filenames {
+			f := pkg.Files[filename]
 			imports = append(imports, f.Imports...)
 		}
 	}