commit 805b631cf77ceee2d31edb120ce360d3539c0a6f
author Vladimir Marko <vmarko@google.com> Wed Sep 05 14:46:06 2018 +0100
committer Vladimir Marko <vmarko@google.com> Wed Sep 05 15:14:03 2018 +0100
tree c7c53d4d569bf0cca91443d5fa9c26dbb3bb9871
parent cff125396f557a2945aaf7759daff74247833137

Fix VecLoad/Int16/StringCharAt.

Test: Additional test in 623-checker-loop-regressions.
Bug: 113099058
Change-Id: I86c45f8c039a74720b31df5509a8b634f5d191d3

compiler/optimizing/code_generator_vector_x86.cc

diff --git a/compiler/optimizing/code_generator_vector_x86.cc b/compiler/optimizing/code_generator_vector_x86.cc
index 086ae07..2502275 100644
--- a/compiler/optimizing/code_generator_vector_x86.cc
+++ b/compiler/optimizing/code_generator_vector_x86.cc
@@ -1205,6 +1205,7 @@
   XmmRegister reg = locations->Out().AsFpuRegister<XmmRegister>();
   bool is_aligned16 = instruction->GetAlignment().IsAlignedAt(16);
   switch (instruction->GetPackedType()) {
+    case DataType::Type::kInt16:  // (short) s.charAt(.) can yield HVecLoad/Int16/StringCharAt.
     case DataType::Type::kUint16:
       DCHECK_EQ(8u, instruction->GetVectorLength());
       // Special handling of compressed/uncompressed string load.
@@ -1232,7 +1233,6 @@
     case DataType::Type::kBool:
     case DataType::Type::kUint8:
     case DataType::Type::kInt8:
-    case DataType::Type::kInt16:
     case DataType::Type::kInt32:
     case DataType::Type::kInt64:
       DCHECK_LE(2u, instruction->GetVectorLength());