Changeset 145

Timestamp:

Sep 5, 2010, 5:58:19 PM (15 years ago)

Author:

dmik

Message:

hotspot: Fixed a crash in the product release build: Odin's try/except emulation doesn't (and cannot) support break/return from try blocks so they must never be used.

File:

• trunk/openjdk/hotspot/src/os/windows/vm/os_windows.cpp (modified) (1 diff)

trunk/openjdk/hotspot/src/os/windows/vm/os_windows.cpp

@@ -2478 +2478 @@
 #define DEFINE_FAST_GETFIELD(Return,Fieldname,Result) \
 Return JNICALL jni_fast_Get##Result##Field_wrapper(JNIEnv *env, jobject obj, jfieldID fieldID) { \
+  Return ret = 0; \
   __try { \
-    return (*JNI_FastGetField::jni_fast_Get##Result##Field_fp)(env, obj, fieldID); \
+    ret = (*JNI_FastGetField::jni_fast_Get##Result##Field_fp)(env, obj, fieldID); \
   } __except(fastJNIAccessorExceptionFilter((_EXCEPTION_POINTERS*)_exception_info())) { \
   } \
-  return 0; \
+  return ret; \
 }