Mercurial > hg > truffle

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author ehelin
date Fri, 14 Mar 2014 13:27:18 +0100
parents 81ccf2c854c7
children 92aa6797d639
line wrap: on
line diff
--- a/src/share/vm/shark/sharkInliner.cpp	Fri Mar 14 09:18:39 2014 +0100
+++ b/src/share/vm/shark/sharkInliner.cpp	Fri Mar 14 13:27:18 2014 +0100
@@ -744,6 +744,10 @@
 }
 
 bool SharkInliner::attempt_inline(ciMethod *target, SharkState *state) {
+  if (!Inline) {
+    return false;
+  }
+
   if (SharkIntrinsics::is_intrinsic(target)) {
     SharkIntrinsics::inline_intrinsic(target, state);
     return true;