diff options
| author | 2018-08-28 16:27:48 +0000 | |
|---|---|---|
| committer | 2018-08-28 16:27:48 +0000 | |
| commit | 6bfbdc7fe3751fb6af6ff65493ab9e0f74ed5ca8 (patch) | |
| tree | a2d391945f5b78e840155bbb420768d9dd402a5d /compiler/optimizing/cha_guard_optimization.cc | |
| parent | aa317ffafe685b96993ffb2617c530f8b950480f (diff) | |
| parent | 625ca4759941299e8a9cc876c985558c4d76bdc0 (diff) | |
Merge changes If4de1e1f,I11493096,I256c7758
* changes:
Remove 'virtual' and 'override' qualifiers on final methods.
Remove superfluous 'virtual' specifiers in ART.
Use 'final' and 'override' specifiers directly in ART.
Diffstat (limited to 'compiler/optimizing/cha_guard_optimization.cc')
| -rw-r--r-- | compiler/optimizing/cha_guard_optimization.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/optimizing/cha_guard_optimization.cc b/compiler/optimizing/cha_guard_optimization.cc index bdc395b52d..c6232ef661 100644 --- a/compiler/optimizing/cha_guard_optimization.cc +++ b/compiler/optimizing/cha_guard_optimization.cc @@ -44,9 +44,9 @@ class CHAGuardVisitor : HGraphVisitor { GetGraph()->SetNumberOfCHAGuards(0); } - void VisitShouldDeoptimizeFlag(HShouldDeoptimizeFlag* flag) OVERRIDE; + void VisitShouldDeoptimizeFlag(HShouldDeoptimizeFlag* flag) override; - void VisitBasicBlock(HBasicBlock* block) OVERRIDE; + void VisitBasicBlock(HBasicBlock* block) override; private: void RemoveGuard(HShouldDeoptimizeFlag* flag); |