After the latest merge from hs-comp, jdk9/dev fails to build for aarch64. It fails with the following errors:-

/home/alexander/build-open-jdk/dev/jdk9/tip/dev/hotspot/src/cpu/aarch64/vm/templateTable_aarch64.cpp:2260:6: error: prototype for 'void TemplateTable::getfield_or_static(int, bool)' does not match any in class 'TemplateTable'
 void TemplateTable::getfield_or_static(int byte_no, bool is_static)

and

/home/alexander/build-open-jdk/dev/jdk9/tip/dev/hotspot/src/cpu/aarch64/vm/templateTable_aarch64.cpp:2464:6: error: prototype for 'void TemplateTable::putfield_or_static(int, bool)' does not match any in class 'TemplateTable'
 void TemplateTable::putfield_or_static(int byte_no, bool is_static) {

The breakage is caused by changeset 8101:0b0b09a60061

changeset: 8101:0b0b09a60061
user: minqi
date: Wed Mar 25 15:18:37 2015 -0700
files: src/cpu/sparc/vm/templateTable_sparc.cpp src/cpu/x86/vm/templateTable_x86.cpp src/share/vm/interpreter/bytecodeInterpreter.cpp src/share/vm/interpreter/bytecodes.cpp src/share/vm/interpreter/bytecodes.hpp src/share/vm/interpreter/interpreterRuntime.cpp src/share/vm/interpreter/linkResolver.cpp src/share/vm/interpreter/rewriter.cpp src/share/vm/interpreter/templateTable.cpp src/share/vm/interpreter/templateTable.hpp src/share/vm/memory/metaspaceShared.cpp src/share/vm/oops/constMethod.hpp src/share/vm/runtime/arguments.cpp
description:
8074345: Enable RewriteBytecodes when VM runs with CDS
Summary: Enable bytecode rewriting when CDS turned on.
Reviewed-by: coleenp, iklam
Contributed-by: yumin.qi@oracle.com, ioi.lam@oracle.com

This chageset modifies templateTable_sparc.cpp and templateTable_x86.cpp, templateTable_aarch64.cpp needs to be updated to reflect these changes.