--- a/hotspot/src/share/vm/opto/parse1.cpp	Thu Feb 25 22:58:43 2010 -0800
+++ b/hotspot/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