comparison 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
comparison
equal deleted inserted replaced
7163:2ed8d74e5984 7212:291ffc492eb6
89 // On-stack replacement 89 // On-stack replacement
90 private: 90 private:
91 bool is_osr() const { 91 bool is_osr() const {
92 return flow()->is_osr_flow(); 92 return flow()->is_osr_flow();
93 } 93 }
94 const llvm::FunctionType* entry_point_type() const { 94 llvm::FunctionType* entry_point_type() const {
95 if (is_osr()) 95 if (is_osr())
96 return SharkType::osr_entry_point_type(); 96 return SharkType::osr_entry_point_type();
97 else 97 else
98 return SharkType::entry_point_type(); 98 return SharkType::entry_point_type();
99 } 99 }