Mercurial > hg > truffle

diff src/share/vm/opto/chaitin.cpp @ 14513:16c705d792be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author morris
date Fri, 28 Feb 2014 08:02:20 -0800
parents 1077c8270209
children 4ca6dc0799b6
line wrap: on
line diff
--- a/src/share/vm/opto/chaitin.cpp	Fri Feb 28 14:56:04 2014 +0100
+++ b/src/share/vm/opto/chaitin.cpp	Fri Feb 28 08:02:20 2014 -0800
@@ -210,7 +210,7 @@
 {
   NOT_PRODUCT( Compile::TracePhase t3("ctorChaitin", &_t_ctorChaitin, TimeCompiler); )
 
-  _high_frequency_lrg = MIN2(float(OPTO_LRG_HIGH_FREQ), _cfg.get_outer_loop_frequency());
+  _high_frequency_lrg = MIN2(double(OPTO_LRG_HIGH_FREQ), _cfg.get_outer_loop_frequency());
 
   // Build a list of basic blocks, sorted by frequency
   _blks = NEW_RESOURCE_ARRAY(Block *, _cfg.number_of_blocks());
@@ -1799,7 +1799,7 @@
           Block *phi_block = _cfg.get_block_for_node(phi);
           if (_cfg.get_block_for_node(phi_block->pred(2)) == block) {
             const RegMask *mask = C->matcher()->idealreg2spillmask[Op_RegI];
-            Node *spill = new (C) MachSpillCopyNode( phi, *mask, *mask );
+            Node *spill = new (C) MachSpillCopyNode(MachSpillCopyNode::LoopPhiInput, phi, *mask, *mask);
             insert_proj( phi_block, 1, spill, maxlrg++ );
             n->set_req(1,spill);
             must_recompute_live = true;