8057696: java -version triggers assertion for slowdebug zero builds
Summary: The change as introduced with JDK-8003426 removed some zero code in cppInterpreter_zero.cpp which called generate_normal_entry() in that same file with a value of synchronized == false unconditionally. However, since the new code calls generate_normal_entry() with either true or false, the assertion in this method is no longer valid.
Reviewed-by: coleenp
Contributed-by: sgehwolf@redhat.com
--- a/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Thu Aug 28 11:59:04 2014 +0200
+++ b/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Mon Sep 08 11:14:41 2014 -0400
@@ -820,14 +820,10 @@
}
address InterpreterGenerator::generate_native_entry(bool synchronized) {
- assert(synchronized == false, "should be");
-
return generate_entry((address) CppInterpreter::native_entry);
}
address InterpreterGenerator::generate_normal_entry(bool synchronized) {
- assert(synchronized == false, "should be");
-
return generate_entry((address) CppInterpreter::normal_entry);
}