Mercurial > hg > graal-compiler

diff src/share/vm/opto/parse3.cpp @ 17799:752ba2e5f6d0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author kvn
date Tue, 25 Feb 2014 15:11:18 -0800
parents 3514ee402842 de95063c0e34
children 3c3953fb3f2a 4ca6dc0799b6
line wrap: on
line diff
--- a/src/share/vm/opto/parse3.cpp	Wed Feb 19 20:12:43 2014 -0800
+++ b/src/share/vm/opto/parse3.cpp	Tue Feb 25 15:11:18 2014 -0800
@@ -361,7 +361,7 @@
     //   should_be_constant = (oop not scavengable || ScavengeRootsInCode >= 2)
     // An oop is not scavengable if it is in the perm gen.
     if (stable_type != NULL && con_type != NULL && con_type->isa_oopptr())
-      con_type = con_type->join(stable_type);
+      con_type = con_type->join_speculative(stable_type);
     break;
 
   case T_ILLEGAL: