Correct and GC unrecognized flags from our tests.

runtime/bin/socket.cc

 // Copyright (c) 2013, 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.
 
 #if !defined(DART_IO_DISABLED)
 
 #include "bin/socket.h"
 
 #include "bin/dartutils.h"
 #include "bin/io_buffer.h"
 #include "bin/isolate_data.h"
 #include "bin/lockers.h"
 #include "bin/thread.h"
 #include "bin/utils.h"
 
 #include "include/dart_api.h"
 
 #include "platform/globals.h"
 #include "platform/utils.h"
 
 namespace dart {
 namespace bin {
 
 static const int kSocketIdNativeField = 0;
 
 ListeningSocketRegistry *globalTcpListeningSocketRegistry = NULL;
 
+bool short_socket_read = false;
+
+bool short_socket_write = false;
+
 void ListeningSocketRegistry::Initialize() {
   ASSERT(globalTcpListeningSocketRegistry == NULL);
   globalTcpListeningSocketRegistry = new ListeningSocketRegistry();
 }
 
 
 ListeningSocketRegistry *ListeningSocketRegistry::Instance() {
   return globalTcpListeningSocketRegistry;
 }
 
@@ skipping 291 matching lines @@
     Dart_SetReturnValue(args, Dart_NewInteger(available));
   } else {
     // Available failed. Mark socket as having data, to trigger a future read
     // event where the actual error can be reported.
     Dart_SetReturnValue(args, Dart_NewInteger(1));
   }
 }
 
 
 void FUNCTION_NAME(Socket_Read)(Dart_NativeArguments args) {
-  static bool short_socket_reads = Dart_IsVMFlagSet("short_socket_read");
   intptr_t socket =
       Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
   int64_t length = 0;
   if (DartUtils::GetInt64Value(Dart_GetNativeArgument(args, 1), &length)) {
-    if (short_socket_reads) {
+    if (short_socket_read) {
       length = (length + 1) / 2;
     }
     uint8_t* buffer = NULL;
     Dart_Handle result = IOBuffer::Allocate(length, &buffer);
     if (Dart_IsError(result)) {
       Dart_PropagateError(result);
     }
     ASSERT(buffer != NULL);
     intptr_t bytes_read = Socket::Read(socket, buffer, length);
     if (bytes_read == length) {
@@ skipping 90 matching lines @@
   Dart_Handle result =
       Dart_Invoke(io_lib,
                   DartUtils::NewString("_makeDatagram"),
                   kNumArgs,
                   dart_args);
   Dart_SetReturnValue(args, result);
 }
 
 
 void FUNCTION_NAME(Socket_WriteList)(Dart_NativeArguments args) {
-  static bool short_socket_writes = Dart_IsVMFlagSet("short_socket_write");
   intptr_t socket =
       Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
   Dart_Handle buffer_obj = Dart_GetNativeArgument(args, 1);
   ASSERT(Dart_IsList(buffer_obj));
   intptr_t offset =
       DartUtils::GetIntptrValue(Dart_GetNativeArgument(args, 2));
   intptr_t length =
       DartUtils::GetIntptrValue(Dart_GetNativeArgument(args, 3));
   bool short_write = false;
-  if (short_socket_writes) {
+  if (short_socket_write) {
     if (length > 1) {
       short_write = true;
     }
     length = (length + 1) / 2;
   }
   Dart_TypedData_Type type;
   uint8_t* buffer = NULL;
   intptr_t len;
   Dart_Handle result = Dart_TypedDataAcquireData(
       buffer_obj, &type, reinterpret_cast<void**>(&buffer), &len);
@@ skipping 469 matching lines @@
   if (Dart_IsError(err)) {
     Dart_PropagateError(err);
   }
   return socket;
 }
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // !defined(DART_IO_DISABLED)