Mercurial > hg > graal-compiler

diff src/share/vm/opto/ifnode.cpp @ 10408:836a62f43af9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 19 Jun 2013 10:45:56 +0200
parents 6f3fd5150b67
children c9ccd7b85f20
line wrap: on
line diff
--- a/src/share/vm/opto/ifnode.cpp	Tue Jun 18 14:23:29 2013 -0700
+++ b/src/share/vm/opto/ifnode.cpp	Wed Jun 19 10:45:56 2013 +0200
@@ -673,7 +673,7 @@
 //           /    Region
 //
 Node* IfNode::fold_compares(PhaseGVN* phase) {
-  if (!EliminateAutoBox || Opcode() != Op_If) return NULL;
+  if (!phase->C->eliminate_boxing() || Opcode() != Op_If) return NULL;
 
   Node* this_cmp = in(1)->in(1);
   if (this_cmp != NULL && this_cmp->Opcode() == Op_CmpI &&