Mercurial > hg > graal-jvmci-8

diff src/share/vm/opto/memnode.hpp @ 1543:1a1603f975b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author kvn
date Wed, 19 May 2010 10:22:39 -0700
parents 9e321dcfa5b7
children c18cbe5936b8
line wrap: on
line diff
--- a/src/share/vm/opto/memnode.hpp	Mon Apr 05 10:17:15 2010 -0700
+++ b/src/share/vm/opto/memnode.hpp	Wed May 19 10:22:39 2010 -0700
@@ -1244,5 +1244,5 @@
   virtual int Opcode() const;
   virtual uint ideal_reg() const { return NotAMachineReg; }
   virtual uint match_edge(uint idx) const { return idx==2; }
-  virtual const Type *bottom_type() const { return Type::ABIO; }
+  virtual const Type *bottom_type() const { return ( AllocatePrefetchStyle == 3 ) ? Type::MEMORY : Type::ABIO; }
 };