Mercurial > hg > truffle
diff src/os_cpu/windows_x86/vm/os_windows_x86.cpp @ 8173:6d23f64f2fdb
Merge.
author | Roland Schatz <roland.schatz@oracle.com> |
---|---|
date | Fri, 08 Mar 2013 13:19:28 +0100 |
parents | b8f261ba79c6 |
children | 6b0fd0964b87 |
line wrap: on
line diff
--- a/src/os_cpu/windows_x86/vm/os_windows_x86.cpp Thu Mar 07 18:24:15 2013 +0100 +++ b/src/os_cpu/windows_x86/vm/os_windows_x86.cpp Fri Mar 08 13:19:28 2013 +0100 @@ -70,7 +70,7 @@ extern LONG WINAPI topLevelExceptionFilter(_EXCEPTION_POINTERS* ); // Install a win32 structured exception handler around thread. -void os::os_exception_wrapper(java_call_t f, JavaValue* value, methodHandle* method, nmethod* nm, JavaCallArguments* args, Thread* thread) { +void os::os_exception_wrapper(java_call_t f, JavaValue* value, methodHandle* method, JavaCallArguments* args, Thread* thread) { __try { #ifndef AMD64 @@ -110,7 +110,7 @@ #endif // ASSERT #endif // !AMD64 - f(value, method, nm, args, thread); + f(value, method, args, thread); } __except(topLevelExceptionFilter((_EXCEPTION_POINTERS*)_exception_info())) { // Nothing to do. }