Merge "Ensure extract is seen as having scalar result."

1 files changed, 2 insertions, 2 deletions

diff --git a/compiler/optimizing/nodes_vector.h b/compiler/optimizing/nodes_vector.h
index 886d75e5c7..c5e75a7ca4 100644
--- a/compiler/optimizing/nodes_vector.h
+++ b/compiler/optimizing/nodes_vector.h
@@ -815,7 +815,7 @@ class HVecUShr FINAL : public HVecBinaryOperation {
 class HVecSetScalars FINAL : public HVecOperation {
  public:
   HVecSetScalars(ArenaAllocator* arena,
-                 HInstruction** scalars,  // array
+                 HInstruction* scalars[],
                  Primitive::Type packed_type,
                  size_t vector_length,
                  size_t number_of_scalars,
@@ -827,7 +827,7 @@ class HVecSetScalars FINAL : public HVecOperation {
                       vector_length,
                       dex_pc) {
     for (size_t i = 0; i < number_of_scalars; i++) {
-      DCHECK(!scalars[i]->IsVecOperation());
+      DCHECK(!scalars[i]->IsVecOperation() || scalars[i]->IsVecExtractScalar());
       SetRawInputAt(0, scalars[i]);
     }
   }