I've attached a patch for this issue. It's been tested with the reference file Test/bug1777340.java...