From 5de6b8411161676466e077386ac0df6c24a1a386 Mon Sep 17 00:00:00 2001
From: Sandboxed API Team <sandboxed-api@google.com>
Date: Thu, 18 Jun 2020 03:18:37 -0700
Subject: [PATCH] Internal change

PiperOrigin-RevId: 317068509
Change-Id: I268381ca50eabed88b189bf79ccc9313e5b7d9ae
---
 sandboxed_api/sandbox2/comms.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sandboxed_api/sandbox2/comms.cc b/sandboxed_api/sandbox2/comms.cc
index b53555d..6bb891c 100644
--- a/sandboxed_api/sandbox2/comms.cc
+++ b/sandboxed_api/sandbox2/comms.cc
@@ -374,7 +374,7 @@ bool Comms::RecvFD(int* fd) {
   // syscall(__NR_recvmsg) semantics so we need to suppress the error (here and
   // everywhere below).
 #ifdef MEMORY_SANITIZER
-  ANNOTATE_MEMORY_IS_INITIALIZED(&tlv, sizeof(tlv));
+  ABSL_ANNOTATE_MEMORY_IS_INITIALIZED(&tlv, sizeof(tlv));
 #endif
 
   if (tlv.tag != kTagFd) {
@@ -384,7 +384,7 @@ bool Comms::RecvFD(int* fd) {
 
   cmsg = CMSG_FIRSTHDR(&msg);
 #ifdef MEMORY_SANITIZER
-  ANNOTATE_MEMORY_IS_INITIALIZED(cmsg, sizeof(cmsghdr));
+  ABSL_ANNOTATE_MEMORY_IS_INITIALIZED(cmsg, sizeof(cmsghdr));
 #endif
   while (cmsg) {
     if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_RIGHTS) {
@@ -397,7 +397,7 @@ bool Comms::RecvFD(int* fd) {
       int* fds = reinterpret_cast<int*>(CMSG_DATA(cmsg));
       *fd = fds[0];
 #ifdef MEMORY_SANITIZER
-      ANNOTATE_MEMORY_IS_INITIALIZED(fd, sizeof(int));
+      ABSL_ANNOTATE_MEMORY_IS_INITIALIZED(fd, sizeof(int));
 #endif
       return true;
     }