Fix Process.runSync on 64-bit Mac OS

runtime/bin/process_macos.cc

 // Copyright (c) 2012, 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 "platform/globals.h"
 #if defined(TARGET_OS_MACOS)
 
 #include "bin/process.h"
 
 #include <errno.h>  // NOLINT
@@ skipping 557 matching lines @@
 
 
 class BufferList: public BufferListBase {
  public:
   bool Read(int fd, intptr_t available) {
     // Read all available bytes.
     while (available > 0) {
       if (free_size_ == 0) Allocate();
       ASSERT(free_size_ > 0);
       ASSERT(free_size_ <= kBufferSize);
-      intptr_t block_size = dart::Utils::Minimum(free_size_, available);
-      intptr_t bytes = TEMP_FAILURE_RETRY(read(
+      size_t block_size = dart::Utils::Minimum(free_size_, available);
+      ssize_t bytes = TEMP_FAILURE_RETRY(read(
           fd,
           reinterpret_cast<void*>(FreeSpaceAddress()),
           block_size));
       if (bytes < 0) return false;
       data_size_ += bytes;
       free_size_ -= bytes;
       available -= bytes;
     }
     return true;
   }
@@ skipping 39 matching lines @@
   }
 
   int alive = 3;
   while (alive > 0) {
     // Blocking call waiting for events from the child process.
     if (TEMP_FAILURE_RETRY(poll(fds, alive, -1)) <= 0) {
       return CloseProcessBuffers(fds);
     }
 
     // Process incoming data.
-    for (int i = 0; i < alive; i++) {
+    int current_alive = alive;
+    for (int i = 0; i < current_alive; i++) {
+      intptr_t avail;
       if (fds[i].revents & POLLIN) {
-        intptr_t avail = FDUtils::AvailableBytes(fds[i].fd);
+        avail = FDUtils::AvailableBytes(fds[i].fd);
         // On Mac OS POLLIN can be set with zero available
         // bytes. POLLHUP is most likely also set in this case.
         if (avail > 0) {
           if (fds[i].fd == out) {
             if (!out_data.Read(out, avail)) {
               return CloseProcessBuffers(fds);
             }
           } else if (fds[i].fd == err) {
             if (!err_data.Read(err, avail)) {
               return CloseProcessBuffers(fds);
             }
           } else if (fds[i].fd == exit_event) {
             if (avail == 8) {
               intptr_t b = TEMP_FAILURE_RETRY(read(fds[i].fd,
                                                    exit_code_data.bytes, 8));
               if (b != 8) {
                 return CloseProcessBuffers(fds);
               }
             }
           } else {
             UNREACHABLE();
           }
         }
       }
-    }
-
-    // Process closed.
-    for (int i = 0; i < alive; i++) {
-      if (fds[i].revents & POLLHUP) {
+      if (fds[i].revents & POLLHUP ||
+          ((fds[i].revents & POLLIN) && avail == 0)) {
         VOID_TEMP_FAILURE_RETRY(close(fds[i].fd));
         alive--;
         if (i < alive) {
           fds[i] = fds[alive];
         }
       }
     }
   }
 
   // All handles closed and all data read.
@@ skipping 21 matching lines @@
 
 
 intptr_t Process::CurrentProcessId() {
   return static_cast<intptr_t>(getpid());
 }
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_MACOS)