commit 4e3734a53614a1db710ea34b81f1cc2260790e7a
author Vladimir Marko <vmarko@google.com> Wed Nov 14 15:45:28 2018 +0000
committer Vladimir Marko <vmarko@google.com> Wed Nov 14 18:44:19 2018 +0000
tree 2d1c5afdff2a46e71d6c576da2d0da0eb7e44f04
parent 8786fd93e01b9c88f708c14743925489f8db8c28

Rename HVecReduce::GetKind() to GetReductionKind().

Avoid hiding HInstruction::GetKind().

Test: m test-art-host-gtest
Change-Id: If7334af437d0a6d93b8228763451c80876aa4d00

compiler/optimizing/nodes_vector.h

diff --git a/compiler/optimizing/nodes_vector.h b/compiler/optimizing/nodes_vector.h
index 597e399..cd4f45e 100644
--- a/compiler/optimizing/nodes_vector.h
+++ b/compiler/optimizing/nodes_vector.h
@@ -384,21 +384,21 @@
              HInstruction* input,
              DataType::Type packed_type,
              size_t vector_length,
-             ReductionKind kind,
+             ReductionKind reduction_kind,
              uint32_t dex_pc)
       : HVecUnaryOperation(kVecReduce, allocator, input, packed_type, vector_length, dex_pc),
-        kind_(kind) {
+        reduction_kind_(reduction_kind) {
     DCHECK(HasConsistentPackedTypes(input, packed_type));
   }
 
-  ReductionKind GetKind() const { return kind_; }
+  ReductionKind GetReductionKind() const { return reduction_kind_; }
 
   bool CanBeMoved() const override { return true; }
 
   bool InstructionDataEquals(const HInstruction* other) const override {
     DCHECK(other->IsVecReduce());
     const HVecReduce* o = other->AsVecReduce();
-    return HVecOperation::InstructionDataEquals(o) && GetKind() == o->GetKind();
+    return HVecOperation::InstructionDataEquals(o) && GetReductionKind() == o->GetReductionKind();
   }
 
   DECLARE_INSTRUCTION(VecReduce);
@@ -407,7 +407,7 @@
   DEFAULT_COPY_CONSTRUCTOR(VecReduce);
 
  private:
-  const ReductionKind kind_;
+  const ReductionKind reduction_kind_;
 };
 
 // Converts every component in the vector,