Mercurial > hg > graal-compiler
comparison src/share/vm/opto/regalloc.cpp @ 18041:52b4284cb496
Merge with jdk8u20-b26
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Wed, 15 Oct 2014 16:02:50 +0200 |
parents | 89152779163c |
children |
comparison
equal
deleted
inserted
replaced
17606:45d7b2c7029d | 18041:52b4284cb496 |
---|---|
75 // Not allowed in the out-preserve area. | 75 // Not allowed in the out-preserve area. |
76 // In-preserve area is allowed so Intel can fetch the return pc out. | 76 // In-preserve area is allowed so Intel can fetch the return pc out. |
77 assert( reg < _matcher._old_SP || | 77 assert( reg < _matcher._old_SP || |
78 (reg >= OptoReg::add(_matcher._old_SP,C->out_preserve_stack_slots()) && | 78 (reg >= OptoReg::add(_matcher._old_SP,C->out_preserve_stack_slots()) && |
79 reg < _matcher._in_arg_limit) || | 79 reg < _matcher._in_arg_limit) || |
80 reg >= OptoReg::add(_matcher._new_SP,C->out_preserve_stack_slots()), | 80 reg >= OptoReg::add(_matcher._new_SP, C->out_preserve_stack_slots()) || |
81 // Allow return_addr in the out-preserve area. | |
82 reg == _matcher.return_addr(), | |
81 "register allocated in a preserve area" ); | 83 "register allocated in a preserve area" ); |
82 return reg2offset_unchecked( reg ); | 84 return reg2offset_unchecked( reg ); |
83 } | 85 } |
84 | 86 |
85 //------------------------------offset2reg------------------------------------- | 87 //------------------------------offset2reg------------------------------------- |