Mercurial > hg > graal-compiler
comparison src/share/vm/runtime/javaCalls.cpp @ 3464:be4ca325525a
Merge.
author | Thomas Wuerthinger <thomas@wuerthinger.net> |
---|---|
date | Wed, 27 Jul 2011 17:32:44 -0700 |
parents | 0654ee04b214 01147d8aac1d |
children | 04b9a2566eec |
comparison
equal
deleted
inserted
replaced
3239:7c4b4daac19b | 3464:be4ca325525a |
---|---|
406 | 406 |
407 // Check that there are shadow pages available before changing thread state | 407 // Check that there are shadow pages available before changing thread state |
408 // to Java | 408 // to Java |
409 if (!os::stack_shadow_pages_available(THREAD, method)) { | 409 if (!os::stack_shadow_pages_available(THREAD, method)) { |
410 // Throw stack overflow exception with preinitialized exception. | 410 // Throw stack overflow exception with preinitialized exception. |
411 Exceptions::throw_stack_overflow_exception(THREAD, __FILE__, __LINE__); | 411 Exceptions::throw_stack_overflow_exception(THREAD, __FILE__, __LINE__, method); |
412 return; | 412 return; |
413 } else { | 413 } else { |
414 // Touch pages checked if the OS needs them to be touched to be mapped. | 414 // Touch pages checked if the OS needs them to be touched to be mapped. |
415 os::bang_stack_shadow_pages(); | 415 os::bang_stack_shadow_pages(); |
416 } | 416 } |