The patch for antlr_cpp that was taken from an upstream PR was merged, so it was dropped from the patchset.