Remove 'virtual' and 'override' qualifiers on final methods.

Cpplint considers that 'virtual' and 'override' qualifers are
redundant for methods declared 'final'.

Test: mmma art
Change-Id: If4de1e1fe306f2ee3db9534930b1d24abeaf9fe4

2 files changed, 7 insertions, 7 deletions

diff --git a/compiler/optimizing/nodes.h b/compiler/optimizing/nodes.h
index 748e21f510..5feffa0511 100644
--- a/compiler/optimizing/nodes.h
+++ b/compiler/optimizing/nodes.h
@@ -2645,7 +2645,7 @@ class HExpression : public HInstruction {
   virtual ~HExpression() {}
 
   using HInstruction::GetInputRecords;  // Keep the const version visible.
-  ArrayRef<HUserRecord<HInstruction*>> GetInputRecords() override final {
+  ArrayRef<HUserRecord<HInstruction*>> GetInputRecords() final {
     return ArrayRef<HUserRecord<HInstruction*>>(inputs_);
   }
 
@@ -2667,7 +2667,7 @@ class HExpression<0> : public HInstruction {
   virtual ~HExpression() {}
 
   using HInstruction::GetInputRecords;  // Keep the const version visible.
-  ArrayRef<HUserRecord<HInstruction*>> GetInputRecords() override final {
+  ArrayRef<HUserRecord<HInstruction*>> GetInputRecords() final {
     return ArrayRef<HUserRecord<HInstruction*>>();
   }
 
@@ -6311,7 +6311,7 @@ class HLoadClass final : public HInstruction {
   void AddSpecialInput(HInstruction* special_input);
 
   using HInstruction::GetInputRecords;  // Keep the const version visible.
-  ArrayRef<HUserRecord<HInstruction*>> GetInputRecords() override final {
+  ArrayRef<HUserRecord<HInstruction*>> GetInputRecords() final {
     return ArrayRef<HUserRecord<HInstruction*>>(
         &special_input_, (special_input_.GetInstruction() != nullptr) ? 1u : 0u);
   }
@@ -6499,7 +6499,7 @@ class HLoadString final : public HInstruction {
   void AddSpecialInput(HInstruction* special_input);
 
   using HInstruction::GetInputRecords;  // Keep the const version visible.
-  ArrayRef<HUserRecord<HInstruction*>> GetInputRecords() override final {
+  ArrayRef<HUserRecord<HInstruction*>> GetInputRecords() final {
     return ArrayRef<HUserRecord<HInstruction*>>(
         &special_input_, (special_input_.GetInstruction() != nullptr) ? 1u : 0u);
   }
@@ -6577,7 +6577,7 @@ class HLoadMethodHandle final : public HInstruction {
   }
 
   using HInstruction::GetInputRecords;  // Keep the const version visible.
-  ArrayRef<HUserRecord<HInstruction*>> GetInputRecords() override final {
+  ArrayRef<HUserRecord<HInstruction*>> GetInputRecords() final {
     return ArrayRef<HUserRecord<HInstruction*>>(
         &special_input_, (special_input_.GetInstruction() != nullptr) ? 1u : 0u);
   }
@@ -6621,7 +6621,7 @@ class HLoadMethodType final : public HInstruction {
   }
 
   using HInstruction::GetInputRecords;  // Keep the const version visible.
-  ArrayRef<HUserRecord<HInstruction*>> GetInputRecords() override final {
+  ArrayRef<HUserRecord<HInstruction*>> GetInputRecords() final {
     return ArrayRef<HUserRecord<HInstruction*>>(
         &special_input_, (special_input_.GetInstruction() != nullptr) ? 1u : 0u);
   }
diff --git a/compiler/utils/assembler.h b/compiler/utils/assembler.h
index 251b82cb54..096410de3e 100644
--- a/compiler/utils/assembler.h
+++ b/compiler/utils/assembler.h
@@ -292,7 +292,7 @@ class DebugFrameOpCodeWriterForAssembler final
   };
 
   // This method is called the by the opcode writers.
-  virtual void ImplicitlyAdvancePC() final;
+  void ImplicitlyAdvancePC() final;
 
   explicit DebugFrameOpCodeWriterForAssembler(Assembler* buffer)
       : dwarf::DebugFrameOpCodeWriter<>(false /* enabled */),