Mercurial > hg > openjdk > hsx17

changeset 1278:7d236a9688c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6930398: fix for return address locals in OSR entries uses wrong test Reviewed-by: kvn
author never
date Mon, 01 Mar 2010 12:12:35 -0800
parents 336c6c200f5f
children ab75c83d7c37
files src/share/vm/opto/parse1.cpp
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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