A64: Synchronize with r18764.

src/a64/lithium-a64.cc

 // Copyright 2013 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 1607 matching lines @@
   return MarkAsCall(DefineFixed(result, x0), instr);
 }
 
 
 LInstruction* LChunkBuilder::DoLoadKeyed(HLoadKeyed* instr) {
   ASSERT(instr->key()->representation().IsSmiOrInteger32());
   ElementsKind elements_kind = instr->elements_kind();
   LOperand* elements = UseRegister(instr->elements());
   LOperand* key = UseRegisterOrConstantAtStart(instr->key());
 
-  if (!instr->is_external()) {
+  if (!instr->is_typed_elements()) {
     if (instr->representation().IsDouble()) {
       LOperand* temp = (!instr->key()->IsConstant() ||
                         instr->RequiresHoleCheck())
              ? TempRegister()
              : NULL;
 
       LLoadKeyedFixedDouble* result =
           new(zone()) LLoadKeyedFixedDouble(elements, key, temp);
       return instr->RequiresHoleCheck()
           ? AssignEnvironment(DefineAsRegister(result))
           : DefineAsRegister(result);
     } else {
       ASSERT(instr->representation().IsSmiOrTagged() ||
              instr->representation().IsInteger32());
       LOperand* temp = instr->key()->IsConstant() ? NULL : TempRegister();
       LLoadKeyedFixed* result =
           new(zone()) LLoadKeyedFixed(elements, key, temp);
       return instr->RequiresHoleCheck()
           ? AssignEnvironment(DefineAsRegister(result))
           : DefineAsRegister(result);
     }
   } else {
     ASSERT((instr->representation().IsInteger32() &&
-            (elements_kind != EXTERNAL_FLOAT_ELEMENTS) &&
-            (elements_kind != EXTERNAL_DOUBLE_ELEMENTS)) ||
+            !IsDoubleOrFloatElementsKind(instr->elements_kind())) ||
            (instr->representation().IsDouble() &&
-            ((elements_kind == EXTERNAL_FLOAT_ELEMENTS) ||
-             (elements_kind == EXTERNAL_DOUBLE_ELEMENTS))));
+            IsDoubleOrFloatElementsKind(instr->elements_kind())));
 
     LOperand* temp = instr->key()->IsConstant() ? NULL : TempRegister();
     LLoadKeyedExternal* result =
         new(zone()) LLoadKeyedExternal(elements, key, temp);
     // An unsigned int array load might overflow and cause a deopt. Make sure it
     // has an environment.
-    return (elements_kind == EXTERNAL_UNSIGNED_INT_ELEMENTS)
-        ? AssignEnvironment(DefineAsRegister(result))
-        : DefineAsRegister(result);
+    if (instr->RequiresHoleCheck() ||
+        elements_kind == EXTERNAL_UNSIGNED_INT_ELEMENTS ||
+        elements_kind == UINT32_ELEMENTS) {
+      return AssignEnvironment(DefineAsRegister(result));
+    } else {
+      return DefineAsRegister(result);
+    }
   }
 }
 
 
 LInstruction* LChunkBuilder::DoLoadKeyedGeneric(HLoadKeyedGeneric* instr) {
   LOperand* object = UseFixed(instr->object(), x1);
   LOperand* key = UseFixed(instr->key(), x0);
 
   LInstruction* result =
       DefineFixed(new(zone()) LLoadKeyedGeneric(object, key), x0);
@@ skipping 393 matching lines @@
   if (instr->RequiresHoleCheck()) {
     return AssignEnvironment(new(zone()) LStoreGlobalCell(value,
                                                           TempRegister(),
                                                           TempRegister()));
   } else {
     return new(zone()) LStoreGlobalCell(value, TempRegister(), NULL);
   }
 }
 
 
-LInstruction* LChunkBuilder::DoStoreGlobalGeneric(HStoreGlobalGeneric* instr) {
-  LOperand* global_object = UseFixed(instr->global_object(), x1);
-  LOperand* value = UseFixed(instr->value(), x0);
-  LStoreGlobalGeneric* result =
-      new(zone()) LStoreGlobalGeneric(global_object, value);
-  return MarkAsCall(result, instr);
-}
-
-
 LInstruction* LChunkBuilder::DoStoreKeyed(HStoreKeyed* instr) {
   LOperand* temp = NULL;
   LOperand* elements = NULL;
   LOperand* val = NULL;
   LOperand* key = NULL;
 
-  if (!instr->is_external() && instr->value()->representation().IsTagged() &&
+  if (!instr->is_typed_elements() &&
+      instr->value()->representation().IsTagged() &&
       instr->NeedsWriteBarrier()) {
     // RecordWrite() will clobber all registers.
     elements = UseRegisterAndClobber(instr->elements());
     val = UseRegisterAndClobber(instr->value());
     key = UseRegisterAndClobber(instr->key());
   } else {
     elements = UseRegister(instr->elements());
     val = UseRegister(instr->value());
     key = UseRegisterOrConstantAtStart(instr->key());
   }
 
-  if (instr->is_external()) {
+  if (instr->is_typed_elements()) {
     ASSERT(instr->elements()->representation().IsExternal());
     ASSERT((instr->value()->representation().IsInteger32() &&
-            (instr->elements_kind() != EXTERNAL_FLOAT_ELEMENTS) &&
-            (instr->elements_kind() != EXTERNAL_DOUBLE_ELEMENTS)) ||
+            !IsDoubleOrFloatElementsKind(instr->elements_kind())) ||
            (instr->value()->representation().IsDouble() &&
-            ((instr->elements_kind() == EXTERNAL_FLOAT_ELEMENTS) ||
-             (instr->elements_kind() == EXTERNAL_DOUBLE_ELEMENTS))));
+            IsDoubleOrFloatElementsKind(instr->elements_kind())));
+    ASSERT((instr->is_fixed_typed_array() &&
+            instr->elements()->representation().IsTagged()) ||
+           (instr->is_external() &&
+            instr->elements()->representation().IsExternal()));
     temp = instr->key()->IsConstant() ? NULL : TempRegister();
     return new(zone()) LStoreKeyedExternal(elements, key, val, temp);
+
   } else if (instr->value()->representation().IsDouble()) {
     ASSERT(instr->elements()->representation().IsTagged());
 
     // The constraint used here is UseRegister, even though the StoreKeyed
     // instruction may canonicalize the value in the register if it is a NaN.
     temp = TempRegister();
     return new(zone()) LStoreKeyedFixedDouble(elements, key, val, temp);
+
   } else {
     ASSERT(instr->elements()->representation().IsTagged());
     ASSERT(instr->value()->representation().IsSmiOrTagged() ||
            instr->value()->representation().IsInteger32());
 
     temp = TempRegister();
     return new(zone()) LStoreKeyedFixed(elements, key, val, temp);
   }
 }
 
@@ skipping 37 matching lines @@
 
 LInstruction* LChunkBuilder::DoStoreNamedGeneric(HStoreNamedGeneric* instr) {
   LOperand* object = UseFixed(instr->object(), x1);
   LOperand* value = UseFixed(instr->value(), x0);
   LInstruction* result = new(zone()) LStoreNamedGeneric(object, value);
   return MarkAsCall(result, instr);
 }
 
 
 LInstruction* LChunkBuilder::DoStringAdd(HStringAdd* instr) {
-  LOperand* left = FLAG_new_string_add ? UseFixed(instr->left(), x1)
-                                       : UseRegisterAtStart(instr->left());
-  LOperand* right = FLAG_new_string_add ? UseFixed(instr->right(), x0)
-                                        : UseRegisterAtStart(instr->right());
+  LOperand* left = UseFixed(instr->left(), x1);
+  LOperand* right = UseFixed(instr->right(), x0);
 
   LStringAdd* result = new(zone()) LStringAdd(left, right);
   return MarkAsCall(DefineFixed(result, x0), instr);
 }
 
 
 LInstruction* LChunkBuilder::DoStringCharCodeAt(HStringCharCodeAt* instr) {
   LOperand* string = UseRegisterAndClobber(instr->string());
   LOperand* index = UseRegisterAndClobber(instr->index());
   LStringCharCodeAt* result = new(zone()) LStringCharCodeAt(string, index);
@@ skipping 273 matching lines @@
 
 LInstruction* LChunkBuilder::DoWrapReceiver(HWrapReceiver* instr) {
   LOperand* receiver = UseRegister(instr->receiver());
   LOperand* function = UseRegister(instr->function());
   LWrapReceiver* result = new(zone()) LWrapReceiver(receiver, function);
   return AssignEnvironment(DefineAsRegister(result));
 }
 
 
 } }  // namespace v8::internal