diff options
| author | 2018-03-29 09:15:56 -0700 | |
|---|---|---|
| committer | 2018-03-29 17:30:49 +0000 | |
| commit | 94e3dd79da6c94a6b024da776b34a87d59a6d53d (patch) | |
| tree | fc41b1b5e8cc44ee51ef30c40ff006f8190c17da /openjdkjvmti/ti_method.cc | |
| parent | 8086e6ab1e853493a81d108b3a9628ef978bc08e (diff) | |
Revert "Revert "Ensure that OSR still is possible with jvmti""
Reason for revert: Fixed issue causing test 1935 to be flaky
This reverts commit 4f3d1cfbee45a27d5997c379f4eb7b7108224ca8.
This unreverts commit b9ad26d1ed9146b89555d4333021f44eeb831f05
Test: ./test.py --host -j50 --all -t 993
Test: ./test.py --host
Test: while ./test/run-test --host --jit 1935; do; done
Test: am start --attach-agent -n com.example.android.displayingbitmaps/.ui.ImageGridActivity
Run blur filter.
Bug: 76226464
Change-Id: Iccdd2d6b788db83786690d697e955c15bcd76c73
Diffstat (limited to 'openjdkjvmti/ti_method.cc')
| -rw-r--r-- | openjdkjvmti/ti_method.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/openjdkjvmti/ti_method.cc b/openjdkjvmti/ti_method.cc index bf2e6cd104..b83310dc85 100644 --- a/openjdkjvmti/ti_method.cc +++ b/openjdkjvmti/ti_method.cc @@ -915,6 +915,9 @@ jvmtiError MethodUtil::SetLocalVariableGeneric(jvmtiEnv* env ATTRIBUTE_UNUSED, if (depth < 0) { return ERR(ILLEGAL_ARGUMENT); } + // Make sure that we know not to do any OSR anymore. + // TODO We should really keep track of this at the Frame granularity. + DeoptManager::Get()->SetLocalsUpdated(); art::Thread* self = art::Thread::Current(); // Suspend JIT since it can get confused if we deoptimize methods getting jitted. art::jit::ScopedJitSuspend suspend_jit; |