diff options
| author | 2016-04-29 11:47:50 +0000 | |
|---|---|---|
| committer | 2016-04-29 11:47:50 +0000 | |
| commit | de604a2d6e69f5a7de10ca4876c758658879124d (patch) | |
| tree | 62922ade4d527f71281bcfebda940d97d06c828e /runtime/quick_exception_handler.cc | |
| parent | 945dc321df3e69bb59c834f6399d34bbfd624e5c (diff) | |
| parent | f39f0097c5cb6f9413f5df0558ffb24bc3221d41 (diff) | |
Merge changes I96464d76,Id5e77316,Icb42a081,I68afc181,I82094e46
* changes:
Fix how the ProfileSaver thread attaches to the runtime.
Fix -Xint and -Xusejit interaction
Add command line option for jit invoke transition weight
Split profile recording from jit compilation
Allow the framework to register sensistive threads to the runtime
Diffstat (limited to 'runtime/quick_exception_handler.cc')
| -rw-r--r-- | runtime/quick_exception_handler.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/quick_exception_handler.cc b/runtime/quick_exception_handler.cc index a785ecba3b..237fdaab0e 100644 --- a/runtime/quick_exception_handler.cc +++ b/runtime/quick_exception_handler.cc @@ -509,7 +509,7 @@ void QuickExceptionHandler::DeoptimizeSingleFrame() { // Compiled code made an explicit deoptimization. ArtMethod* deopt_method = visitor.GetSingleFrameDeoptMethod(); DCHECK(deopt_method != nullptr); - if (Runtime::Current()->UseJit()) { + if (Runtime::Current()->UseJitCompilation()) { Runtime::Current()->GetJit()->GetCodeCache()->InvalidateCompiledCodeFor( deopt_method, visitor.GetSingleFrameDeoptQuickMethodHeader()); } else { |