Mercurial > hg > truffle
diff src/share/vm/shark/sharkFunction.hpp @ 7212:291ffc492eb6
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Fri, 14 Dec 2012 14:35:13 +0100 |
parents | 2cd5e15048e6 |
children |
line wrap: on
line diff
--- a/src/share/vm/shark/sharkFunction.hpp Fri Dec 14 10:20:54 2012 +0100 +++ b/src/share/vm/shark/sharkFunction.hpp Fri Dec 14 14:35:13 2012 +0100 @@ -91,7 +91,7 @@ bool is_osr() const { return flow()->is_osr_flow(); } - const llvm::FunctionType* entry_point_type() const { + llvm::FunctionType* entry_point_type() const { if (is_osr()) return SharkType::osr_entry_point_type(); else