comparison src/share/vm/shark/sharkInliner.cpp @ 14702:d4dd5204c0aa

Merge
author ehelin
date Fri, 14 Mar 2014 13:27:18 +0100
parents 81ccf2c854c7
children 92aa6797d639
comparison
equal deleted inserted replaced
14701:d3ef21095134 14702:d4dd5204c0aa
742 742
743 return true; 743 return true;
744 } 744 }
745 745
746 bool SharkInliner::attempt_inline(ciMethod *target, SharkState *state) { 746 bool SharkInliner::attempt_inline(ciMethod *target, SharkState *state) {
747 if (!Inline) {
748 return false;
749 }
750
747 if (SharkIntrinsics::is_intrinsic(target)) { 751 if (SharkIntrinsics::is_intrinsic(target)) {
748 SharkIntrinsics::inline_intrinsic(target, state); 752 SharkIntrinsics::inline_intrinsic(target, state);
749 return true; 753 return true;
750 } 754 }
751 755