Mercurial > hg > graal-compiler
diff src/share/vm/asm/assembler.hpp @ 6275:957c266d8bc5
Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Tue, 21 Aug 2012 10:39:19 +0200 |
parents | 1d7922586cf6 |
children | b9a9ed0f8eeb |
line wrap: on
line diff
--- a/src/share/vm/asm/assembler.hpp Mon Aug 20 15:21:31 2012 +0200 +++ b/src/share/vm/asm/assembler.hpp Tue Aug 21 10:39:19 2012 +0200 @@ -406,12 +406,8 @@ // offsets in code which must be generated before the object class is loaded. // Field offsets are never zero, since an object's header (mark word) // is located at offset zero. - RegisterOrConstant delayed_value(int(*value_fn)(), Register tmp, int offset = 0) { - return delayed_value_impl(delayed_value_addr(value_fn), tmp, offset); - } - RegisterOrConstant delayed_value(address(*value_fn)(), Register tmp, int offset = 0) { - return delayed_value_impl(delayed_value_addr(value_fn), tmp, offset); - } + RegisterOrConstant delayed_value(int(*value_fn)(), Register tmp, int offset = 0); + RegisterOrConstant delayed_value(address(*value_fn)(), Register tmp, int offset = 0); virtual RegisterOrConstant delayed_value_impl(intptr_t* delayed_value_addr, Register tmp, int offset) = 0; // Last overloading is platform-dependent; look in assembler_<arch>.cpp. static intptr_t* delayed_value_addr(int(*constant_fn)());