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

>log</a><a href='/guix/tree/.dir-locals.el?id=ade20696c9bcce73bc4ab3c4a8a986cd2ac30da7'>tree</a><a href='/guix/commit/.dir-locals.el?id=ade20696c9bcce73bc4ab3c4a8a986cd2ac30da7'>commit</a><a href='/guix/diff/.dir-locals.el?id=ade20696c9bcce73bc4ab3c4a8a986cd2ac30da7'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/.dir-locals.el'>
<input type='hidden' name='id' value='ade20696c9bcce73bc4ab3c4a8a986cd2ac30da7'/><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=ade20696c9bcce73bc4ab3c4a8a986cd2ac30da7'>root</a>/<a href='/guix/log/.dir-locals.el?id=ade20696c9bcce73bc4ab3c4a8a986cd2ac30da7'>.dir-locals.el</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/.dir-locals.el?id=ade20696c9bcce73bc4ab3c4a8a986cd2ac30da7&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-09-14 10:51:26 +0200'>2020-09-14</span></td><td><a href='/guix/commit/.dir-locals.el?id=14c422c12c86126cfb5ca7e1641bbcd78d02f711'>deduplication: pass store directory to replace-with-link.</a><span class='msg-avail'>...<span class='msg-tooltip'>This causes with-writable-file to take into consideration the actual store
being used, as passed to 'deduplicate', rather than
whatever (%store-directory) may return.

* guix/store/deduplication.scm (replace-with-link): new keyword argument
  'store'.  Pass to with-writable-file.
  (with-writable-file, call-with-writable-file): new store argument.
  (deduplicate): pass store to replace-with-link.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Caleb Ristvedt</td></tr>
<tr><td><span title='2020-09-14 10:51:26 +0200'>2020-09-14</span></td><td><a href='/guix/commit/.dir-locals.el?id=1d40e6fdd1898d94d9611b01ebd893aab72dec54'>.dir-locals.el: fix call-with-{retrying-}transaction indenting.</a><span class='msg-avail'>...<span class='msg-tooltip'>* .dir-locals.el (call-with-transaction, call-with-retrying-transaction):
  change scheme-indent-function property from 2 to 1.

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