[simd.js] Clean up bad merge in messages.js

src/messages.js

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // -------------------------------------------------------------------
 
 var $errorToString;
 var MakeError;
 var MakeEvalError;
 var MakeRangeError;
@@ skipping 30 matching lines @@
 var Int8x16ToString;
 var InternalArray = utils.InternalArray;
 var internalErrorSymbol = utils.GetPrivateSymbol("internal_error_symbol");
 var ObjectDefineProperty;
 var ObjectToString;
 var stackTraceSymbol = utils.GetPrivateSymbol("stack_trace_symbol");
 var StringCharAt;
 var StringIndexOf;
 var StringSubstring;
 var ToString;
-var Float32x4ToString;
-var Int32x4ToString;
+var Uint16x8ToString;
 var Uint32x4ToString;
-var Bool32x4ToString;
-var Int16x8ToString;
-var Uint16x8ToString;
-var Bool16x8ToString;
-var Int8x16ToString;
 var Uint8x16ToString;
-var Bool8x16ToString;
 
 utils.Import(function(from) {
   ArrayJoin = from.ArrayJoin;
   Bool16x8ToString = from.Bool16x8ToString;
   Bool32x4ToString = from.Bool32x4ToString;
   Bool8x16ToString = from.Bool8x16ToString;
   Float32x4ToString = from.Float32x4ToString;
   FunctionSourceString = from.FunctionSourceString;
   Int16x8ToString = from.Int16x8ToString;
   Int32x4ToString = from.Int32x4ToString;
   Int8x16ToString = from.Int8x16ToString;
   ObjectDefineProperty = from.ObjectDefineProperty;
   ObjectToString = from.ObjectToString;
   StringCharAt = from.StringCharAt;
   StringIndexOf = from.StringIndexOf;
   StringSubstring = from.StringSubstring;
-  Float32x4ToString = from.Float32x4ToString;
-  Int32x4ToString = from.Int32x4ToString;
+  Uint16x8ToString = from.Uint16x8ToString;
   Uint32x4ToString = from.Uint32x4ToString;
-  Bool32x4ToString = from.Bool32x4ToString;
-  Int16x8ToString = from.Int16x8ToString;
-  Uint16x8ToString = from.Uint16x8ToString;
-  Bool16x8ToString = from.Bool16x8ToString;
-  Int8x16ToString = from.Int8x16ToString;
   Uint8x16ToString = from.Uint8x16ToString;
-  Bool8x16ToString = from.Bool8x16ToString;
 });
 
 utils.ImportNow(function(from) {
   ToString = from.ToString;
 });
 
 // -------------------------------------------------------------------
 
 var GlobalError;
 var GlobalTypeError;
@@ skipping 23 matching lines @@
       str = %_SubString(str, 0, 111) + "...<omitted>..." +
             %_SubString(str, str.length - 2, str.length);
     }
     return str;
   }
   if (IS_SYMBOL(obj)) return %_CallFunction(obj, $symbolToString);
   if (IS_SIMD_VALUE(obj)) {
     switch (typeof(obj)) {
       case 'float32x4': return %_CallFunction(obj, Float32x4ToString);
       case 'int32x4':   return %_CallFunction(obj, Int32x4ToString);
+      case 'int16x8':   return %_CallFunction(obj, Int16x8ToString);
+      case 'int8x16':   return %_CallFunction(obj, Int8x16ToString);
       case 'uint32x4':   return %_CallFunction(obj, Uint32x4ToString);
+      case 'uint16x8':   return %_CallFunction(obj, Uint16x8ToString);
+      case 'uint8x16':   return %_CallFunction(obj, Uint8x16ToString);
       case 'bool32x4':  return %_CallFunction(obj, Bool32x4ToString);
-      case 'int16x8':   return %_CallFunction(obj, Int16x8ToString);
-      case 'uint16x8':   return %_CallFunction(obj, Uint16x8ToString);
       case 'bool16x8':  return %_CallFunction(obj, Bool16x8ToString);
-      case 'int8x16':   return %_CallFunction(obj, Int8x16ToString);
-      case 'uint8x16':   return %_CallFunction(obj, Uint8x16ToString);
       case 'bool8x16':  return %_CallFunction(obj, Bool8x16ToString);
     }
   }
   if (IS_OBJECT(obj)
       && %GetDataProperty(obj, "toString") === ObjectToString) {
     var constructor = %GetDataProperty(obj, "constructor");
     if (typeof constructor == "function") {
       var constructorName = constructor.name;
       if (IS_STRING(constructorName) && constructorName !== "") {
         return "#<" + constructorName + ">";
@@ skipping 904 matching lines @@
   to["range_error_function"] = GlobalRangeError;
   to["reference_error_function"] = GlobalReferenceError;
   to["stack_overflow_boilerplate"] = StackOverflowBoilerplate;
   to["syntax_error_function"] = GlobalSyntaxError;
   to["to_detail_string_fun"] = ToDetailString;
   to["type_error_function"] = GlobalTypeError;
   to["uri_error_function"] = GlobalURIError;
 });
 
 });