File java-1_7_0-openjdk-zero-annotate-aborting-functions-zero.patch of Package java-1_7_0-openjdk.1449
--- openjdk/hotspot/src/cpu/zero/vm/thumb2.cpp
+++ openjdk/hotspot/src/cpu/zero/vm/thumb2.cpp
@@ -2742,7 +2742,7 @@
out_16x2(codebuf, T_DMB(0xe));
}
-int tbh(CodeBuf *codebuf, Reg base, Reg idx)
+void tbh(CodeBuf *codebuf, Reg base, Reg idx)
{
out_16x2(codebuf, T_TBH(base, idx));
}
@@ -3113,7 +3113,7 @@
J_Unimplemented();
}
-int chka(CodeBuf *codebuf, u32 size, u32 idx)
+void chka(CodeBuf *codebuf, u32 size, u32 idx)
{
cmp_reg(codebuf, idx, size);
it(codebuf, COND_CS, IT_MASK_T);
@@ -3437,6 +3437,7 @@
if ((mask & (1<<ARM_IP)) == 0) return ARM_IP;
if ((mask & (1<<ARM_LR)) == 0) return ARM_LR;
JASSERT(0, "failed to allocate a tmp reg");
+ return ARM_IP;
}
void Thumb2_Flush(Thumb2_Info *jinfo)
--- openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
@@ -67,6 +67,7 @@
frame os::get_sender_for_C_frame(frame* fr) {
ShouldNotCallThis();
+ return frame();
}
frame os::current_frame() {
@@ -439,6 +440,7 @@
extern "C" {
int SpinPause() {
+ return 0;
}
int SafeFetch32(int *adr, int errValue) {
--- openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c
+++ openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c
@@ -142,6 +142,7 @@ jboolean XShared_initIDs(JNIEnv *env, jb
#endif /* MITSHM */
#endif /* !HEADLESS */
+return JNI_FALSE;
}
@@ -491,6 +492,7 @@ jboolean XShared_initSurface(JNIEnv *env
return JNI_TRUE;
#endif /* !HEADLESS */
+return JNI_FALSE;
}
--- openjdk/hotspot/src/share/vm/utilities/debug.hpp
+++ openjdk/hotspot/src/share/vm/utilities/debug.hpp
@@ -166,14 +166,14 @@
// error reporting helper functions
void report_vm_error(const char* file, int line, const char* error_msg,
- const char* detail_msg = NULL);
-void report_fatal(const char* file, int line, const char* message);
+ const char* detail_msg = NULL) __attribute__((noreturn));
+void report_fatal(const char* file, int line, const char* message) __attribute__((noreturn));
void report_vm_out_of_memory(const char* file, int line, size_t size,
- const char* message);
-void report_should_not_call(const char* file, int line);
-void report_should_not_reach_here(const char* file, int line);
-void report_unimplemented(const char* file, int line);
-void report_untested(const char* file, int line, const char* message);
+ const char* message) __attribute__((noreturn));
+void report_should_not_call(const char* file, int line) __attribute__((noreturn));
+void report_should_not_reach_here(const char* file, int line) __attribute__((noreturn));
+void report_unimplemented(const char* file, int line) __attribute__((noreturn));
+void report_untested(const char* file, int line, const char* message) __attribute__((noreturn));
void warning(const char* format, ...);