diff options
| author | 2017-09-05 23:01:02 +0000 | |
|---|---|---|
| committer | 2017-09-05 23:01:02 +0000 | |
| commit | 28f53f57265134a9eac2dd3fe7782056357ce4fb (patch) | |
| tree | 64ca841bef8f6e030e03548044ebe924d279598f /compiler/dex/quick_compiler_callbacks.h | |
| parent | 901679cbdf4c0179d784313c10285de8c21abc93 (diff) | |
| parent | d3ea5b3d7f6a829fba5979657ee8af9d8b2a7fdb (diff) | |
Merge changes I66c62317,Id097273a,If3bfe695
* changes:
ART: Recognize compile-time soft-fails
ART: Change CanAssumeVerified to GetPreviousClassState
ART: Move Class::Status to ClassStatus
Diffstat (limited to 'compiler/dex/quick_compiler_callbacks.h')
| -rw-r--r-- | compiler/dex/quick_compiler_callbacks.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/dex/quick_compiler_callbacks.h b/compiler/dex/quick_compiler_callbacks.h index 578aff45e5..45456f2a1c 100644 --- a/compiler/dex/quick_compiler_callbacks.h +++ b/compiler/dex/quick_compiler_callbacks.h @@ -54,7 +54,7 @@ class QuickCompilerCallbacks FINAL : public CompilerCallbacks { verification_results_ = verification_results; } - bool CanAssumeVerified(ClassReference ref) OVERRIDE; + ClassStatus GetPreviousClassState(ClassReference ref) OVERRIDE; void SetDoesClassUnloading(bool does_class_unloading, CompilerDriver* compiler_driver) OVERRIDE { |