Merge commit '6b49e6a14fa2' from llvm.org/main into next

Author: git apple-llvm automerger

libc/shared/rpc_opcodes.h

@@ -47,9 +47,9 @@ typedef enum {
   LIBC_SYSTEM = LLVM_LIBC_OPCODE(29),
 
   // Internal opcodes for testing.
-  LIBC_TEST_INCREMENT = LLVM_LIBC_OPCODE(1 << 15),
-  LIBC_TEST_INTERFACE = LLVM_LIBC_OPCODE((1 << 15) + 1),
-  LIBC_TEST_STREAM = LLVM_LIBC_OPCODE((1 << 15) + 2),
+  LIBC_TEST_INCREMENT = LLVM_LIBC_OPCODE((1 << 15)),
+  LIBC_TEST_INTERFACE = LLVM_LIBC_OPCODE(((1 << 15) + 1)),
+  LIBC_TEST_STREAM = LLVM_LIBC_OPCODE(((1 << 15) + 2)),
   LIBC_LAST = 0xFFFFFFFF,
 } rpc_opcode_t;
 

libc/src/__support/RPC/rpc_server.h

@@ -298,7 +298,7 @@ LIBC_INLINE static void handle_printf(rpc::Server::Port &port,
 
     results[lane] = static_cast<int>(
         fwrite(buffer, 1, writer.get_chars_written(), files[lane]));
-    if (results[lane] != writer.get_chars_written() || ret == -1)
+    if (size_t(results[lane]) != writer.get_chars_written() || ret == -1)
       results[lane] = -1;
   }