Based on the upstream fix for the java8 compilation issue.
Simplified patch.
Upstream version of patch does not work with this source tree.

The issue is that in java8 it is an error to pass null to
removeAll. Results in null pointer exception. java7
behaviour was to return the list unmodified.

From db2a350c6d90efaa8dde949fa76005c2c5af45c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Boskovits?= <boskovits@gmail.com>
Date: Fri, 5 Jan 2018 17:05:31 +0100
Subject: [PATCH] Fix java8 compilation.

---
 src/org/antlr/tool/CompositeGrammar.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/org/antlr/tool/CompositeGrammar.java b/src/org/antlr/tool/CompositeGrammar.java
index f1408e7..7e02431 100644
--- a/src/org/antlr/tool/CompositeGrammar.java
+++ b/src/org/antlr/tool/CompositeGrammar.java
@@ -218,7 +218,9 @@ public class CompositeGrammar {
 	public List<Grammar> getIndirectDelegates(Grammar g) {
 		List<Grammar> direct = getDirectDelegates(g);
 		List<Grammar> delegates = getDelegates(g);
-		delegates.removeAll(direct);
+		if (direct != null) {
+			delegates.removeAll(direct);
+		}
 		return delegates;
 	}
 
-- 
2.15.1

a><a href='/guix/tree/tests/ui.scm?id=bf69fa10236af2b85367aa073b8e5b7d2636e151'>tree</a><a href='/guix/commit/tests/ui.scm?id=bf69fa10236af2b85367aa073b8e5b7d2636e151'>commit</a><a href='/guix/diff/tests/ui.scm?id=bf69fa10236af2b85367aa073b8e5b7d2636e151'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/ui.scm'>
<input type='hidden' name='id' value='bf69fa10236af2b85367aa073b8e5b7d2636e151'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=bf69fa10236af2b85367aa073b8e5b7d2636e151'>root</a>/<a href='/guix/log/tests?id=bf69fa10236af2b85367aa073b8e5b7d2636e151'>tests</a>/<a href='/guix/log/tests/ui.scm?id=bf69fa10236af2b85367aa073b8e5b7d2636e151'>ui.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/ui.scm?id=bf69fa10236af2b85367aa073b8e5b7d2636e151&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-03-25 16:02:53 +0100'>2020-03-25</span></td><td><a href='/guix/commit/tests/ui.scm?id=c136da3fbd92a5db1f889d37f0a7c938ccd63648'>tests: Adjust to 'show-manifest-transaction' changes.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is a followup to 3e5ab0a7a9399bb098b9ced46bf3cbf4085c6bab.

* tests/ui.scm ("show-manifest-transaction"): Update regexp.
* tests/guix-package.sh: Adjust Emacs regexp in --with-source test.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-02-23 12:47:13 +0100'>2020-02-23</span></td><td><a href='/guix/commit/tests/ui.scm?id=fa99c4bbc7acdb8def9ce14a05aacb73f99fe3b1'>ui: (size-&gt;number "1.M") is correctly parsed.</a><span class='msg-avail'>...<span class='msg-tooltip'>Reported by Pierre Neidhardt &lt;mail@ambrevar.xyz&gt;.

* guix/ui.scm (size-&gt;number)[unit-pos]: Add #\. to CHAR-SET:DIGIT.
* tests/ui.scm ("size-&gt;number, 1.M"): New test.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-09-19 23:24:04 +0200'>2019-09-19</span></td><td><a href='/guix/commit/tests/ui.scm?id=d2cdef65605b9e14bfa02c3bf1612ab6b62f4a89'>ui: 'relevance' connects regexps with a logical and.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;https://bugs.gnu.org/36763&gt;.
Previously, the logical and connecting the regexps did not output the expected
results (introduced in 8874faaaac665100a095ef25e39c9a389f5a397f).

* guix/ui.scm (relevance)
[score]: Change its arguments.
[regexp-&gt;score]: New procedure.
* tests/ui.scm ("package-relevance"): Add test.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>zimoun</td></tr>