Revert fix for type checking of void type, because some top level tests fail.

tests/language/type_vm_test.dart

 // Copyright (c) 2011, 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.
 // VMOptions=--enable_type_checks --enable_asserts
 //
 // Dart test program testing type checks.
 
 class TypeTest {
   static test() {
     int result = 0;
     try {
       int i = "hello";  // Throws a TypeError if type checks are enabled.
     } catch (TypeError error) {
       result = 1;
       Expect.equals("int", error.dstType);
-      Expect.equals("String", error.srcType);
+      Expect.equals("OneByteString", error.srcType);
       Expect.equals("i", error.dstName);
       int pos = error.url.lastIndexOf("/", error.url.length);
       if (pos == -1) {
         pos = error.url.lastIndexOf("\\", error.url.length);
       }
       String subs = error.url.substring(pos + 1, error.url.length);
       Expect.equals("type_vm_test.dart", subs);
       Expect.equals(12, error.line);
       Expect.equals(15, error.column);
     }
@@ skipping 20 matching lines @@
   static testArgument() {
     int result = 0;
     int f(int i) {
       return i;
     }
     try {
       int i = f("hello");  // Throws a TypeError if type checks are enabled.
     } catch (TypeError error) {
       result = 1;
       Expect.equals("int", error.dstType);
-      Expect.equals("String", error.srcType);
+      Expect.equals("OneByteString", error.srcType);
       Expect.equals("i", error.dstName);
       int pos = error.url.lastIndexOf("/", error.url.length);
       if (pos == -1) {
         pos = error.url.lastIndexOf("\\", error.url.length);
       }
       String subs = error.url.substring(pos + 1, error.url.length);
       Expect.equals("type_vm_test.dart", subs);
       Expect.equals(49, error.line);
       Expect.equals(15, error.column);
     }
     return result;
   }
 
   static testReturn() {
     int result = 0;
     int f(String s) {
       return s;
     }
     try {
       int i = f("hello");  // Throws a TypeError if type checks are enabled.
     } catch (TypeError error) {
       result = 1;
       Expect.equals("int", error.dstType);
-      Expect.equals("String", error.srcType);
+      Expect.equals("OneByteString", error.srcType);
       Expect.equals("function result", error.dstName);
       int pos = error.url.lastIndexOf("/", error.url.length);
       if (pos == -1) {
         pos = error.url.lastIndexOf("\\", error.url.length);
       }
       String subs = error.url.substring(pos + 1, error.url.length);
       Expect.equals("type_vm_test.dart", subs);
       Expect.equals(74, error.line);
       Expect.equals(14, error.column);
     }
     return result;
   }
 
   static int field;
   static testField() {
     int result = 0;
     try {
       field = "hello";  // Throws a TypeError if type checks are enabled.
     } catch (TypeError error) {
       result = 1;
       Expect.equals("int", error.dstType);
-      Expect.equals("String", error.srcType);
+      Expect.equals("OneByteString", error.srcType);
       Expect.equals("field", error.dstName);
       int pos = error.url.lastIndexOf("/", error.url.length);
       if (pos == -1) {
         pos = error.url.lastIndexOf("\\", error.url.length);
       }
       String subs = error.url.substring(pos + 1, error.url.length);
       Expect.equals("type_vm_test.dart", subs);
       Expect.equals(99, error.line);
       Expect.equals(15, error.column);
     }
@@ skipping 89 matching lines @@
     return result;
   }
 
   static testBoolCheck() {
     int result = 0;
     try {
       bool i = !"hello";  // Throws a TypeError if type checks are enabled.
     } catch (TypeError error) {
       result++;
       Expect.equals("bool", error.dstType);
-      Expect.equals("String", error.srcType);
+      Expect.equals("OneByteString", error.srcType);
       Expect.equals("boolean expression", error.dstName);
       int pos = error.url.lastIndexOf("/", error.url.length);
       if (pos == -1) {
         pos = error.url.lastIndexOf("\\", error.url.length);
       }
       String subs = error.url.substring(pos + 1, error.url.length);
       Expect.equals("type_vm_test.dart", subs);
       Expect.equals(209, error.line);
       Expect.equals(17, error.column);
     }
     try {
       while ("hello") {};  // Throws a TypeError if type checks are enabled.
     } catch (TypeError error) {
       result++;
       Expect.equals("bool", error.dstType);
-      Expect.equals("String", error.srcType);
+      Expect.equals("OneByteString", error.srcType);
       Expect.equals("boolean expression", error.dstName);
       int pos = error.url.lastIndexOf("/", error.url.length);
       if (pos == -1) {
         pos = error.url.lastIndexOf("\\", error.url.length);
       }
       String subs = error.url.substring(pos + 1, error.url.length);
       Expect.equals("type_vm_test.dart", subs);
       Expect.equals(225, error.line);
       Expect.equals(14, error.column);
     }
     try {
       do {} while ("hello");  // Throws a TypeError if type checks are enabled.
     } catch (TypeError error) {
       result++;
       Expect.equals("bool", error.dstType);
-      Expect.equals("String", error.srcType);
+      Expect.equals("OneByteString", error.srcType);
       Expect.equals("boolean expression", error.dstName);
       int pos = error.url.lastIndexOf("/", error.url.length);
       if (pos == -1) {
         pos = error.url.lastIndexOf("\\", error.url.length);
       }
       String subs = error.url.substring(pos + 1, error.url.length);
       Expect.equals("type_vm_test.dart", subs);
       Expect.equals(241, error.line);
       Expect.equals(20, error.column);
     }
     try {
       for (;"hello";) {};  // Throws a TypeError if type checks are enabled.
     } catch (TypeError error) {
       result++;
       Expect.equals("bool", error.dstType);
-      Expect.equals("String", error.srcType);
+      Expect.equals("OneByteString", error.srcType);
       Expect.equals("boolean expression", error.dstName);
       int pos = error.url.lastIndexOf("/", error.url.length);
       if (pos == -1) {
         pos = error.url.lastIndexOf("\\", error.url.length);
       }
       String subs = error.url.substring(pos + 1, error.url.length);
       Expect.equals("type_vm_test.dart", subs);
       Expect.equals(257, error.line);
       Expect.equals(13, error.column);
     }
     try {
       int i = "hello" ? 1 : 0;  // Throws a TypeError if type checks are enabled.
     } catch (TypeError error) {
       result++;
       Expect.equals("bool", error.dstType);
-      Expect.equals("String", error.srcType);
+      Expect.equals("OneByteString", error.srcType);
       Expect.equals("boolean expression", error.dstName);
       int pos = error.url.lastIndexOf("/", error.url.length);
       if (pos == -1) {
         pos = error.url.lastIndexOf("\\", error.url.length);
       }
       String subs = error.url.substring(pos + 1, error.url.length);
       Expect.equals("type_vm_test.dart", subs);
       Expect.equals(273, error.line);
       Expect.equals(15, error.column);
     }
     try {
       if ("hello") {};  // Throws a TypeError if type checks are enabled.
     } catch (TypeError error) {
       result++;
       Expect.equals("bool", error.dstType);
-      Expect.equals("String", error.srcType);
+      Expect.equals("OneByteString", error.srcType);
       Expect.equals("boolean expression", error.dstName);
       int pos = error.url.lastIndexOf("/", error.url.length);
       if (pos == -1) {
         pos = error.url.lastIndexOf("\\", error.url.length);
       }
       String subs = error.url.substring(pos + 1, error.url.length);
       Expect.equals("type_vm_test.dart", subs);
       Expect.equals(289, error.line);
       Expect.equals(11, error.column);
     }
     try {
       if ("hello" || false) {};  // Throws a TypeError if type checks are enabled.
     } catch (TypeError error) {
       result++;
       Expect.equals("bool", error.dstType);
-      Expect.equals("String", error.srcType);
+      Expect.equals("OneByteString", error.srcType);
       Expect.equals("boolean expression", error.dstName);
       int pos = error.url.lastIndexOf("/", error.url.length);
       if (pos == -1) {
         pos = error.url.lastIndexOf("\\", error.url.length);
       }
       String subs = error.url.substring(pos + 1, error.url.length);
       Expect.equals("type_vm_test.dart", subs);
       Expect.equals(305, error.line);
       Expect.equals(11, error.column);
     }
     try {
       if (false || "hello") {};  // Throws a TypeError if type checks are enabled.
     } catch (TypeError error) {
       result++;
       Expect.equals("bool", error.dstType);
-      Expect.equals("String", error.srcType);
+      Expect.equals("OneByteString", error.srcType);
       Expect.equals("boolean expression", error.dstName);
       int pos = error.url.lastIndexOf("/", error.url.length);
       if (pos == -1) {
         pos = error.url.lastIndexOf("\\", error.url.length);
       }
       String subs = error.url.substring(pos + 1, error.url.length);
       Expect.equals("type_vm_test.dart", subs);
       Expect.equals(321, error.line);
       Expect.equals(20, error.column);
     }
@@ skipping 134 matching lines @@
 class C {
   factory C() {
     return 1;  // Implicit result type is 'C', not int.
   }
 }
 
 
 main() {
   TypeTest.testMain();
 }