diff src/share/vm/shark/sharkFunction.cpp @ 7643:3ac7d10a6572

Merge with hsx25/hotspot.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Thu, 31 Jan 2013 15:42:25 +0100
parents c095a7f289aa
children de6a9e811145
line wrap: on
line diff
--- a/src/share/vm/shark/sharkFunction.cpp	Thu Jan 31 11:32:14 2013 +0100
+++ b/src/share/vm/shark/sharkFunction.cpp	Thu Jan 31 15:42:25 2013 +0100
@@ -77,6 +77,10 @@
   // Walk the tree from the start block to determine which
   // blocks are entered and which blocks require phis
   SharkTopLevelBlock *start_block = block(flow()->start_block_num());
+  if (is_osr() && start_block->stack_depth_at_entry() != 0) {
+    env()->record_method_not_compilable("can't compile OSR block with incoming stack-depth > 0");
+    return;
+  }
   assert(start_block->start() == flow()->start_bci(), "blocks out of order");
   start_block->enter();