Zero VM build fails after JDK-8203883

/Users/fool/workspace/open/jdk/src/hotspot/share/interpreter/invocationCounter.cpp:91:3: error: use of undeclared identifier 'InterpreterInvocationLimit'; did you mean 'InvocationCounter::InterpreterInvocationLimit'?
  InterpreterInvocationLimit = CompileThreshold << number_of_noncount_bits;
  ^~~~~~~~~~~~~~~~~~~~~~~~~~
  InvocationCounter::InterpreterInvocationLimit
/Users/fool/workspace/open/jdk/src/hotspot/share/interpreter/invocationCounter.cpp:85:46: note: 'InvocationCounter::InterpreterInvocationLimit' declared here
int InvocationCounter::InterpreterInvocationLimit;
                                             ^
/Users/fool/workspace/open/jdk/src/hotspot/share/interpreter/invocationCounter.cpp:91:52: error: use of undeclared identifier 'number_of_noncount_bits'; did you mean 'InvocationCounter::number_of_count_bits'?
  InterpreterInvocationLimit = CompileThreshold << number_of_noncount_bits;
                                                   ^~~~~~~~~~~~~~~~~~~~~~~
                                                   InvocationCounter::number_of_count_bits
/Users/fool/workspace/open/jdk/src/hotspot/share/interpreter/invocationCounter.hpp:56:5: note: 'InvocationCounter::number_of_count_bits' declared here
    number_of_count_bits = BitsPerInt - number_of_noncount_bits,
    ^
/Users/fool/workspace/open/jdk/src/hotspot/share/interpreter/invocationCounter.cpp:98:5: error: use of undeclared identifier 'InterpreterBackwardBranchLimit'; did you mean 'InvocationCounter::InterpreterBackwardBranchLimit'?
   ... (rest of output omitted)