This is clone of JDK-8354636;

The s390x code was originally using the C++ interpreter which has been replaced by the template interpreter. (Only the zero build still uses the C++ interpreter.) There are some leftovers from the C++ interpreter in the s390x comments which should get replaced, especially "frame manager".