Fixes a bug in CheckClassInstr on arm64.

runtime/vm/intrinsifier_arm64.cc

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/globals.h"  // Needed here to get TARGET_ARCH_ARM64.
 #if defined(TARGET_ARCH_ARM64)
 
 #include "vm/intrinsifier.h"
 
 #include "vm/assembler.h"
@@ skipping 274 matching lines @@
   /* R2: requested array length argument. */                                   \
   __ tsti(R2, kSmiTagMask);                                                    \
   __ b(&fall_through, NE);                                                     \
   __ CompareRegisters(R2, ZR);                                                 \
   __ b(&fall_through, LT);                                                     \
   __ SmiUntag(R2);                                                             \
   /* Check for maximum allowed length. */                                      \
   /* R2: untagged array length. */                                             \
   __ CompareImmediate(R2, max_len, kNoPP);                                     \
   __ b(&fall_through, GT);                                                     \
-  __ Lsl(R2, R2, scale_shift);                                                 \
+  __ LslImmediate(R2, R2, scale_shift);                                        \
   const intptr_t fixed_size = sizeof(Raw##type_name) + kObjectAlignment - 1;   \
   __ AddImmediate(R2, R2, fixed_size, kNoPP);                                  \
   __ andi(R2, R2, ~(kObjectAlignment - 1));                                    \
   Heap* heap = Isolate::Current()->heap();                                     \
                                                                                \
   __ LoadImmediate(R0, heap->TopAddress(), kNoPP);                             \
   __ ldr(R0, Address(R0, 0));                                                  \
                                                                                \
   /* R2: allocation size. */                                                   \
   __ add(R1, R0, Operand(R2));                                                 \
@@ skipping 13 matching lines @@
   __ LoadImmediate(R3, heap->TopAddress(), kNoPP);                             \
   __ str(R1, Address(R3, 0));                                                  \
   __ AddImmediate(R0, R0, kHeapObjectTag, kNoPP);                              \
   __ UpdateAllocationStatsWithSize(cid, R2, kNoPP);                            \
   /* Initialize the tags. */                                                   \
   /* R0: new object start as a tagged pointer. */                              \
   /* R1: new object end address. */                                            \
   /* R2: allocation size. */                                                   \
   {                                                                            \
     __ CompareImmediate(R2, RawObject::SizeTag::kMaxSizeTag, kNoPP);           \
-    __ Lsl(R2, R2, RawObject::kSizeTagPos - kObjectAlignmentLog2);             \
+    __ LslImmediate(R2, R2, RawObject::kSizeTagPos - kObjectAlignmentLog2);    \
     __ csel(R2, ZR, R2, HI);                                                   \
                                                                                \
     /* Get the class index and insert it into the tags. */                     \
     __ LoadImmediate(TMP, RawObject::ClassIdTag::encode(cid), kNoPP);          \
     __ orr(R2, R2, Operand(TMP));                                              \
     __ str(R2, FieldAddress(R0, type_name::tags_offset()));  /* Tags. */       \
   }                                                                            \
   /* Set the length field. */                                                  \
   /* R0: new object start as a tagged pointer. */                              \
   /* R1: new object end address. */                                            \
@@ skipping 175 matching lines @@
   // R1: Tagged left (dividend).
   // R0: Tagged right (divisor).
   // Check if modulo by zero -> exception thrown in main function.
   __ CompareRegisters(R0, ZR);
   __ b(&fall_through, EQ);
   EmitRemainderOperation(assembler);
   // Untagged right in R0. Untagged remainder result in R1.
 
   __ CompareRegisters(R1, ZR);
   __ b(&neg_remainder, LT);
-  __ Lsl(R0, R1, 1);  // Tag and move result to R0.
+  __ SmiTag(R0, R1);  // Tag and move result to R0.
   __ ret();
 
   __ Bind(&neg_remainder);
   // Result is negative, adjust it.
   __ CompareRegisters(R0, ZR);
   __ sub(TMP, R1, Operand(R0));
   __ add(TMP2, R1, Operand(R0));
   __ csel(R0, TMP2, TMP, GE);
   __ SmiTag(R0);
   __ ret();
@@ skipping 89 matching lines @@
   const Register result = R0;
   Label fall_through;
 
   TestBothArgumentsSmis(assembler, &fall_through);
   __ CompareImmediate(
       right, reinterpret_cast<int64_t>(Smi::New(Smi::kBits)), PP);
   __ b(&fall_through, CS);
 
   // Left is not a constant.
   // Check if count too large for handling it inlined.
-  __ Asr(TMP, right, kSmiTagSize);  // SmiUntag right into TMP.
+  __ SmiUntag(TMP, right);  // SmiUntag right into TMP.
   // Overflow test (preserve left, right, and TMP);
   __ lslv(temp, left, TMP);
   __ asrv(TMP2, temp, TMP);
   __ CompareRegisters(left, TMP2);
   __ b(&fall_through, NE);  // Overflow.
   // Shift for result now we know there is no overflow.
   __ lslv(result, left, TMP);
   __ ret();
   __ Bind(&fall_through);
 }
@@ skipping 342 matching lines @@
 
   __ Bind(&is_true);
   __ mov(R0, true_reg);
 
   __ Bind(&is_false);
   __ ret();
 
   __ Bind(&is_zero);
   // Check for negative zero by looking at the sign bit.
   __ fmovrd(R1, V0);
-  __ Lsr(R1, R1, 63);
+  __ LsrImmediate(R1, R1, 63);
   __ tsti(R1, 1);
   __ csel(R0, true_reg, false_reg, NE);  // Sign bit set.
   __ ret();
 }
 
 
 void Intrinsifier::DoubleToInteger(Assembler* assembler) {
   Label fall_through;
 
   __ ldr(R0, Address(SP, 0 * kWordSize));
@@ skipping 56 matching lines @@
 
   __ ldr(R0, Address(SP, 0 * kWordSize));  // Receiver.
   __ ldr(R1, FieldAddress(R0, state_field.Offset()));  // Field '_state'.
 
   // Addresses of _state[0].
   const int64_t disp =
       Instance::DataOffsetFor(kTypedDataUint32ArrayCid) - kHeapObjectTag;
 
   __ LoadImmediate(R0, a_int_value, kNoPP);
   __ LoadFromOffset(R2, R1, disp, kNoPP);
-  __ Lsr(R3, R2, 32);
+  __ LsrImmediate(R3, R2, 32);
   __ andi(R2, R2, 0xffffffff);
   __ mul(R2, R0, R2);
   __ add(R2, R2, Operand(R3));
   __ StoreToOffset(R2, R1, disp, kNoPP);
   __ ret();
 }
 
 
 void Intrinsifier::ObjectEquals(Assembler* assembler) {
   __ ldr(R0, Address(SP, 0 * kWordSize));
@@ skipping 212 matching lines @@
   // Initialize the tags.
   // R0: new object start as a tagged pointer.
   // R1: new object end address.
   // R2: allocation size.
   {
     const intptr_t shift = RawObject::kSizeTagPos - kObjectAlignmentLog2;
     const Class& cls =
         Class::Handle(isolate->object_store()->one_byte_string_class());
 
     __ CompareImmediate(R2, RawObject::SizeTag::kMaxSizeTag, kNoPP);
-    __ Lsl(R2, R2, shift);
+    __ LslImmediate(R2, R2, shift);
     __ csel(R2, R2, ZR, LS);
 
     // Get the class index and insert it into the tags.
     // R2: size and bit tags.
     __ LoadImmediate(TMP, RawObject::ClassIdTag::encode(cls.id()), kNoPP);
     __ orr(R2, R2, Operand(TMP));
     __ str(R2, FieldAddress(R0, String::tags_offset()));  // Store tags.
   }
 
   // Set the length field using the saved length (R6).
@@ skipping 204 matching lines @@
   Isolate* isolate = Isolate::Current();
   __ LoadImmediate(R1, reinterpret_cast<uword>(isolate), kNoPP);
   // Set return value to Isolate::current_tag_.
   __ ldr(R0, Address(R1, Isolate::current_tag_offset()));
   __ ret();
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_ARM64