Mercurial > hg > graal-jvmci-8

diff src/share/vm/opto/multnode.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 de95063c0e34
children cd5d10655495
line wrap: on
line diff
--- a/src/share/vm/opto/multnode.cpp	Wed Feb 19 20:12:43 2014 -0800
+++ b/src/share/vm/opto/multnode.cpp	Tue Feb 25 15:11:18 2014 -0800
@@ -94,7 +94,7 @@
   if ((_con == TypeFunc::Parms) &&
       n->is_CallStaticJava() && n->as_CallStaticJava()->is_boxing_method()) {
     // The result of autoboxing is always non-null on normal path.
-    t = t->join(TypePtr::NOTNULL);
+    t = t->join_speculative(TypePtr::NOTNULL);
   }
   return t;
 }