From a68e47ab1f2fc2411253c878518e09b9a7c119b5 Mon Sep 17 00:00:00 2001
From: Nik Everett <nik9000@gmail.com>
Date: Wed, 16 Sep 2020 09:03:49 -0400
Subject: [PATCH] Check for runtime field loops in queries (backport of #61927)
 (#62420)

We were checking for loops in queries before, but we had an "off by one"
error where we wouldn't notice the "top level" runtime field when
detecting a loop. So the error message would be wrong.

I also caught a few bugs with query generation caused by missing
`@Override` annotations and fixed a few of them. There is a bug with
`regexp` queries with match options that I'm not fixing in this PR but
will get to later.

Relates to #59332