[sanitizers] Fix missing header for mac builds

[rastogishubham]

This change breaks the lldb greendragon bot

/Users/buildslave/jenkins/workspace/lldb-cmake/llvm-project/lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp:521:32: error: no type named 'tokens_iterator' in 'clang::MacroInfo'

for (clang::MacroInfo::tokens_iterator ti = macro_info->tokens_begin(),
     ~~~~~~~~~~~~~~~~~~^

/Users/buildslave/jenkins/workspace/lldb-cmake/llvm-project/lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp:522:51: error: expected ';' in 'for' statement specifier

te = macro_info->tokens_end();
   ^

/Users/buildslave/jenkins/workspace/lldb-cmake/llvm-project/lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp:522:51: error: expected expression
/Users/buildslave/jenkins/workspace/lldb-cmake/llvm-project/lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp:523:20: error: use of undeclared identifier 'te'

ti != te; ++ti) {
      ^

/Users/buildslave/jenkins/workspace/lldb-cmake/llvm-project/lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp:523:22: error: expected ')'

ti != te; ++ti) {
        ^

/Users/buildslave/jenkins/workspace/lldb-cmake/llvm-project/lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp:521:13: note: to match this '('

for (clang::MacroInfo::tokens_iterator ti = macro_info->tokens_begin(),
    ^

/Users/buildslave/jenkins/workspace/lldb-cmake/llvm-project/lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp:523:24: warning: misleading indentation; statement is not part of the previous 'for' [-Wmisleading-indentation]

ti != te; ++ti) {
          ^

/Users/buildslave/jenkins/workspace/lldb-cmake/llvm-project/lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp:521:9: note: previous statement is here

for (clang::MacroInfo::tokens_iterator ti = macro_info->tokens_begin(),
^

/Users/buildslave/jenkins/workspace/lldb-cmake/llvm-project/lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp:523:28: error: expected ';' after expression

ti != te; ++ti) {
              ^
              ;

/Users/buildslave/jenkins/workspace/lldb-cmake/llvm-project/lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp:523:26: error: use of undeclared identifier 'ti'

ti != te; ++ti) {
            ^

/Users/buildslave/jenkins/workspace/lldb-cmake/llvm-project/lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp:523:28: error: expected expression

ti != te; ++ti) {
              ^

1 warning and 8 errors generated.

Build log here:

https://green.lab.llvm.org/green/job/lldb-cmake/41315/

I tried a local revert and the errors did vanish.

To reproduce the errors, please run

please ninja check-lldb-unit and revert the change or fix the error as soon as possible

Thanks!

[abrachet]

In D119598#3316068, @rastogishubham wrote:

This change breaks the lldb greendragon bot

Build log here:

https://green.lab.llvm.org/green/job/lldb-cmake/41315/

I tried a local revert and the errors did vanish.

To reproduce the errors, please run

please ninja check-lldb-unit and revert the change or fix the error as soon as possible

Thanks!

It was https://reviews.llvm.org/D117348

[paulkirth]

That is unfortunate, since this patch was needed to fix our mac builds after https://reviews.llvm.org/D119546. Similarly, https://reviews.llvm.org/rG11b0506c08897a132b1b810be4ca71c3d605c7e9 fixed the issue in the same manner.

I'm a bit confused as to why adding a header caused your issue. I don't mind reverting per se, but this is the correct fix from what I can tell.

[paulkirth]

Ah, thanks for pointing that out @abrachet

[rastogishubham]

Ah I see, weird because I just locally reverted this change and those errors vanished though there are other errors that popped up in its place, which I suspected were due to some other change because greendragon has been red for a while. Thanks @abrachet

compiler-rt/lib/sanitizer_common/sanitizer_mac.cpp

 //===-- sanitizer_mac.cpp -------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
 // This file is shared between various sanitizers' runtime libraries and

 #ifndef _DARWIN_USE_64_BIT_INODE
 #define _DARWIN_USE_64_BIT_INODE 1
 #endif
 #include <stdio.h>
 
 #include "sanitizer_common.h"
 #include "sanitizer_file.h"
 #include "sanitizer_flags.h"
+#include "sanitizer_interface_internal.h"
 #include "sanitizer_internal_defs.h"
 #include "sanitizer_libc.h"
 #include "sanitizer_platform_limits_posix.h"
 #include "sanitizer_procmaps.h"
 #include "sanitizer_ptrauth.h"
 
 #if !SANITIZER_IOS
 #include <crt_externs.h>  // for _NSGetEnviron
 #else
 extern char **environ;
 #endif
 
 #if defined(__has_include) && __has_include(<os/trace.h>)
 #define SANITIZER_OS_TRACE 1
 #include <os/trace.h>
 #else
 #define SANITIZER_OS_TRACE 0
 #endif
 
 // import new crash reporting api
 #if defined(__has_include) && __has_include(<CrashReporterClient.h>)