File no-return-nonvoid.patch of Package java-1_6_0-openjdk
--- icedtea6-1.13.13/openjdk/hotspot/src/cpu/zero/vm/assembler_zero.cpp 2020-09-17 07:20:22.186373934 +0200
+++ icedtea6-1.13.13/openjdk/hotspot/src/cpu/zero/vm/assembler_zero.cpp 2020-09-17 08:47:18.161931444 +0200
@@ -73,6 +73,7 @@
RegisterOrConstant MacroAssembler::delayed_value_impl(
intptr_t* delayed_value_addr, Register tmpl, int offset) {
ShouldNotCallThis();
+ return RegisterOrConstant();
}
void MacroAssembler::store_oop(jobject obj) {
--- icedtea6-1.13.13/openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp 2020-09-17 07:20:22.186373934 +0200
+++ icedtea6-1.13.13/openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp 2020-09-17 09:17:01.543376339 +0200
@@ -108,6 +108,7 @@
return result;
default : ShouldNotReachHere();
}
+ return 0;
}
@@ -1875,6 +1876,7 @@
address CppInterpreter::return_entry(TosState state, int length) {
ShouldNotCallThis();
+ return NULL;
}
address CppInterpreter::deopt_entry(TosState state, int length) {
@@ -1892,9 +1894,8 @@
bool CppInterpreter::contains(address pc) {
#ifdef PRODUCT
ShouldNotCallThis();
-#else
- return false; // make frame::print_value_on work
#endif // !PRODUCT
+ return false; // make frame::print_value_on work
}
// Result handlers and convertors
--- icedtea6-1.13.13/openjdk/hotspot/src/cpu/zero/vm/frame_zero.cpp 2020-09-17 07:20:22.182373908 +0200
+++ icedtea6-1.13.13/openjdk/hotspot/src/cpu/zero/vm/frame_zero.cpp 2020-09-17 09:35:41.867283744 +0200
@@ -106,6 +106,7 @@
bool frame::safe_for_sender(JavaThread *thread) {
ShouldNotCallThis();
+ return false;
}
void frame::pd_gc_epilog() {
@@ -113,6 +114,7 @@
bool frame::is_interpreted_frame_valid(JavaThread *thread) const {
ShouldNotCallThis();
+ return false;
}
BasicType frame::interpreter_frame_result(oop* oop_result,
@@ -174,9 +176,8 @@
int frame::frame_size(RegisterMap* map) const {
#ifdef PRODUCT
ShouldNotCallThis();
-#else
- return 0; // make javaVFrame::print_value work
#endif // PRODUCT
+ return 0; // make javaVFrame::print_value work
}
intptr_t* frame::interpreter_frame_tos_at(jint offset) const {
--- icedtea6-1.13.13/openjdk/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp 2020-09-17 07:20:22.186373934 +0200
+++ icedtea6-1.13.13/openjdk/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp 2020-09-17 07:33:27.379392682 +0200
@@ -36,7 +36,7 @@
_deopt_state = unknown;
}
-inline address frame::sender_pc() const { ShouldNotCallThis(); }
+inline address frame::sender_pc() const { ShouldNotCallThis(); return NULL; }
inline frame::frame(ZeroFrame* zf, intptr_t* sp) {
_zeroframe = zf;
@@ -80,6 +80,7 @@
inline intptr_t* frame::link() const {
ShouldNotCallThis();
+ return NULL;
}
#ifdef CC_INTERP
@@ -142,14 +143,17 @@
inline oop frame::saved_oop_result(RegisterMap* map) const {
ShouldNotCallThis();
+ return NULL;
}
inline bool frame::is_older(intptr_t* id) const {
ShouldNotCallThis();
+ return false;
}
inline intptr_t* frame::entry_frame_argument_at(int offset) const {
ShouldNotCallThis();
+ return NULL;
}
inline intptr_t* frame::unextended_sp() const {
--- icedtea6-1.13.13/openjdk/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp 2020-09-17 07:20:22.186373934 +0200
+++ icedtea6-1.13.13/openjdk/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp 2020-09-17 10:04:15.599062762 +0200
@@ -49,9 +49,11 @@
address InlineCacheBuffer::ic_buffer_entry_point(address code_begin) {
// NB ic_stub_code_size() must return the size of the code we generate
ShouldNotCallThis();
+ return NULL;
}
oop InlineCacheBuffer::ic_buffer_cached_oop(address code_begin) {
// NB ic_stub_code_size() must return the size of the code we generate
ShouldNotCallThis();
+ return NULL;
}
--- icedtea6-1.13.13/openjdk/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp 2020-09-17 07:20:22.186373934 +0200
+++ icedtea6-1.13.13/openjdk/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp 2020-09-17 08:12:09.251381676 +0200
@@ -40,6 +40,7 @@
Register tmp,
int offset) {
ShouldNotCallThis();
+ return RegisterOrConstant();
}
};
--- icedtea6-1.13.13/openjdk/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp 2020-09-17 07:20:22.186373934 +0200
+++ icedtea6-1.13.13/openjdk/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp 2020-09-17 11:38:29.194574764 +0200
@@ -60,6 +60,7 @@
frame MethodHandles::ricochet_frame_sender(const frame& fr, RegisterMap *map) {
ShouldNotCallThis();
+ return frame();
}
void MethodHandles::ricochet_frame_oops_do(const frame& fr, OopClosure* blk, const RegisterMap* reg_map) {
--- icedtea6-1.13.13/openjdk/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp 2020-09-17 07:20:22.186373934 +0200
+++ icedtea6-1.13.13/openjdk/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp 2020-09-17 08:09:40.690393627 +0200
@@ -51,15 +51,18 @@
public:
bool is_jump() {
ShouldNotCallThis();
+ return false;
}
bool is_safepoint_poll() {
ShouldNotCallThis();
+ return false;
}
};
inline NativeInstruction* nativeInstruction_at(address address) {
ShouldNotCallThis();
+ return NULL;
}
class NativeCall : public NativeInstruction {
@@ -70,18 +73,22 @@
address instruction_address() const {
ShouldNotCallThis();
+ return NULL;
}
address next_instruction_address() const {
ShouldNotCallThis();
+ return NULL;
}
address return_address() const {
ShouldNotCallThis();
+ return NULL;
}
address destination() const {
ShouldNotCallThis();
+ return NULL;
}
void set_destination_mt_safe(address dest) {
@@ -98,25 +105,30 @@
static bool is_call_before(address return_address) {
ShouldNotCallThis();
+ return false;
}
};
inline NativeCall* nativeCall_before(address return_address) {
ShouldNotCallThis();
+ return NULL;
}
inline NativeCall* nativeCall_at(address address) {
ShouldNotCallThis();
+ return NULL;
}
class NativeMovConstReg : public NativeInstruction {
public:
address next_instruction_address() const {
ShouldNotCallThis();
+ return NULL;
}
intptr_t data() const {
ShouldNotCallThis();
+ return 0;
}
void set_data(intptr_t x) {
@@ -126,12 +138,14 @@
inline NativeMovConstReg* nativeMovConstReg_at(address address) {
ShouldNotCallThis();
+ return NULL;
}
class NativeMovRegMem : public NativeInstruction {
public:
int offset() const {
ShouldNotCallThis();
+ return 0;
}
void set_offset(intptr_t x) {
@@ -145,6 +159,7 @@
inline NativeMovRegMem* nativeMovRegMem_at(address address) {
ShouldNotCallThis();
+ return NULL;
}
class NativeJump : public NativeInstruction {
@@ -155,6 +170,7 @@
address jump_destination() const {
ShouldNotCallThis();
+ return NULL;
}
void set_jump_destination(address dest) {
@@ -172,12 +188,14 @@
inline NativeJump* nativeJump_at(address address) {
ShouldNotCallThis();
+ return NULL;
}
class NativeGeneralJump : public NativeInstruction {
public:
address jump_destination() const {
ShouldNotCallThis();
+ return NULL;
}
static void insert_unconditional(address code_pos, address entry) {
@@ -191,6 +209,7 @@
inline NativeGeneralJump* nativeGeneralJump_at(address address) {
ShouldNotCallThis();
+ return NULL;
}
#endif // CPU_ZERO_VM_NATIVEINST_ZERO_HPP
--- icedtea6-1.13.13/openjdk/hotspot/src/cpu/zero/vm/register_zero.hpp 2020-09-17 07:20:22.186373934 +0200
+++ icedtea6-1.13.13/openjdk/hotspot/src/cpu/zero/vm/register_zero.hpp 2020-09-17 14:04:14.654457503 +0200
@@ -114,5 +114,8 @@
};
CONSTANT_REGISTER_DECLARATION(Register, noreg, (-1));
+#ifndef DONT_USE_REGISTER_DEFINES
+#define noreg ((Register)(noreg_RegisterEnumValue))
+#endif
#endif // CPU_ZERO_VM_REGISTER_ZERO_HPP
--- icedtea6-1.13.13/openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp 2020-09-17 07:20:22.194373985 +0200
+++ icedtea6-1.13.13/openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp 2020-09-17 12:35:02.822192782 +0200
@@ -67,6 +67,7 @@
frame os::get_sender_for_C_frame(frame* fr) {
ShouldNotCallThis();
+ return frame();
}
frame os::current_frame() {
@@ -104,16 +105,19 @@
address os::Linux::ucontext_get_pc(ucontext_t* uc) {
ShouldNotCallThis();
+ return NULL;
}
ExtendedPC os::fetch_frame_from_context(void* ucVoid,
intptr_t** ret_sp,
intptr_t** ret_fp) {
ShouldNotCallThis();
+ return ExtendedPC();
}
frame os::fetch_frame_from_context(void* ucVoid) {
ShouldNotCallThis();
+ return frame();
}
#ifdef HOTSPOT_ASM
@@ -292,6 +296,7 @@
int os::Linux::get_fpu_control_word() {
ShouldNotCallThis();
+ return 0;
}
void os::Linux::set_fpu_control_word(int fpu) {
@@ -440,6 +445,7 @@
extern "C" {
int SpinPause() {
+ return 0; // Shouldn't matter.
}
int SafeFetch32(int *adr, int errValue) {
--- icedtea6-1.13.13/openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp 2020-09-17 07:20:22.194373985 +0200
+++ icedtea6-1.13.13/openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp 2020-09-17 08:10:41.266796507 +0200
@@ -110,6 +110,7 @@
void* ucontext,
bool isInJava) {
ShouldNotCallThis();
+ return false;
}
// These routines are only used on cpu architectures that
