Mercurial > hg > truffle

diff src/share/vm/shark/sharkInliner.cpp @ 14669:81ccf2c854c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8036619: Shark: add LLVM 3.4 support Reviewed-by: twisti
author neugens
date Tue, 04 Mar 2014 18:52:06 -0800
parents de6a9e811145
children 92aa6797d639
line wrap: on
line diff
--- a/src/share/vm/shark/sharkInliner.cpp	Tue Mar 04 17:14:00 2014 +0100
+++ b/src/share/vm/shark/sharkInliner.cpp	Tue Mar 04 18:52:06 2014 -0800
@@ -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;