Revert "Revert "[Macros] Mitigate plugin process 'wait' failure""

This reverts commit 8474d27.

Author: hamishknight

lib/AST/PluginRegistry.cpp

@@ -220,8 +220,10 @@ LoadedExecutablePlugin::PluginProcess::~PluginProcess() {
   // that. Usually when the pipe is closed above, the plugin detects the EOF in
   // the stdin and exits immediately, so this usually doesn't wait for the
   // timeout. Note that we can't use '0' because it performs a non-blocking
-  // wait, which make the plugin a zombie if it hasn't exited.
-  llvm::sys::Wait(process, /*SecondsToWait=*/1);
+  // wait, which make the plugin a zombie if it hasn't exited. We don't use
+  // a small number like '1' because the timeout alarm(3) can fire before the
+  // wait4(2).
+  llvm::sys::Wait(process, /*SecondsToWait=*/10);
 }
 
 ssize_t LoadedExecutablePlugin::PluginProcess::read(void *buf,