# HG changeset patch
# User never
# Date 1267474355 28800
# Node ID 7d236a9688c584d962e873ce38c5a6194a049324
# Parent  336c6c200f5fd41576f1cb4d03a5134b454c0fb2
6930398: fix for return address locals in OSR entries uses wrong test
Reviewed-by: kvn

diff -r 336c6c200f5f -r 7d236a9688c5 src/share/vm/opto/parse1.cpp
--- a/src/share/vm/opto/parse1.cpp	Thu Feb 25 22:58:43 2010 -0800
+++ b/src/share/vm/opto/parse1.cpp	Mon Mar 01 12:12:35 2010 -0800
@@ -317,7 +317,7 @@
         continue;
       }
     }
-    if (type->basic_type() == T_ADDRESS) {
+    if (osr_block->flow()->local_type_at(index)->is_return_address()) {
       // In our current system it's illegal for jsr addresses to be
       // live into an OSR entry point because the compiler performs
       // inlining of jsrs.  ciTypeFlow has a bailout that detect this