diff -r 48096fdaae16 src/cpu/ppc/vm/abstractInterpreter_ppc.cpp --- a/src/cpu/ppc/vm/abstractInterpreter_ppc.cpp Thu Jan 07 08:38:37 2016 +0100 +++ b/src/cpu/ppc/vm/abstractInterpreter_ppc.cpp Thu Jan 07 09:01:32 2016 +0100 @@ -25,6 +25,7 @@ #include "precompiled.hpp" #include "interpreter/interpreter.hpp" +#include "interpreter/templateInterpreterGenerator.hpp" #include "oops/constMethod.hpp" #include "oops/method.hpp" #include "runtime/frame.inline.hpp" @@ -54,7 +55,7 @@ // These should never be compiled since the interpreter will prefer // the compiled version to the intrinsic version. bool AbstractInterpreter::can_be_compiled(methodHandle m) { - return !TemplateInterpreter::math_entry_available(method_kind(m)); + return !TemplateInterpreterGenerator::math_entry_available(method_kind(m)); } // How much stack a method activation needs in stack slots. diff -r 48096fdaae16 src/cpu/ppc/vm/templateInterpreterGenerator_ppc.cpp --- a/src/cpu/ppc/vm/templateInterpreterGenerator_ppc.cpp Thu Jan 07 08:38:37 2016 +0100 +++ b/src/cpu/ppc/vm/templateInterpreterGenerator_ppc.cpp Thu Jan 07 09:01:32 2016 +0100 @@ -1108,11 +1108,10 @@ (kind==Interpreter::java_lang_math_abs)); } - // End of helpers address TemplateInterpreterGenerator::generate_math_entry(AbstractInterpreter::MethodKind kind) { - if (!TemplateInterpreter::math_entry_available(kind)) { + if (!math_entry_available(kind)) { NOT_PRODUCT(__ should_not_reach_here();) return NULL; } diff -r 48096fdaae16 src/share/vm/interpreter/templateInterpreter.hpp --- a/src/share/vm/interpreter/templateInterpreter.hpp Thu Jan 07 08:38:37 2016 +0100 +++ b/src/share/vm/interpreter/templateInterpreter.hpp Thu Jan 07 09:01:32 2016 +0100 @@ -193,13 +193,6 @@ // Size of interpreter code. Max size with JVMTI static int InterpreterCodeSize; - -#ifdef PPC - public: - // PPC-only: Support abs and sqrt like in compiler. - // For others we can use a normal (native) entry. - static bool math_entry_available(AbstractInterpreter::MethodKind kind); -#endif }; #endif // !CC_INTERP diff -r 48096fdaae16 src/share/vm/interpreter/templateInterpreterGenerator.hpp --- a/src/share/vm/interpreter/templateInterpreterGenerator.hpp Thu Jan 07 08:38:37 2016 +0100 +++ b/src/share/vm/interpreter/templateInterpreterGenerator.hpp Thu Jan 07 09:01:32 2016 +0100 @@ -124,6 +124,10 @@ void generate_fixed_frame(bool native_call, Register Rsize_of_parameters, Register Rsize_of_locals); void generate_stack_overflow_check(Register Rframe_size, Register Rscratch1); +public: + // PPC-only: Support abs and sqrt like in compiler. + // For others we can use a normal (native) entry. + static bool math_entry_available(AbstractInterpreter::MethodKind kind); #endif // PPC public: