From: Vedant Kumar <vsk@apple.com>
Date: Thu, 31 Oct 2019 23:25:24 +0000 (-0700)
Subject: [profile] Second speculative fix for Windows
X-Git-Tag: llvmorg-11-init~5287
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6dfe8e590e1e50e26c80af59971bc206d8c567f6;p=platform%2Fupstream%2Fllvm.git

[profile] Second speculative fix for Windows

VLAs in C appear to not work on Windows, so use COMPILER_RT_ALLOCA:

C:\b\slave\sanitizer-windows\llvm-project\compiler-rt\lib\profile\InstrProfilingWriter.c(264): error C2057: expected constant expression
C:\b\slave\sanitizer-windows\llvm-project\compiler-rt\lib\profile\InstrProfilingWriter.c(264): error C2466: cannot allocate an array of constant size 0
C:\b\slave\sanitizer-windows\llvm-project\compiler-rt\lib\profile\InstrProfilingWriter.c(264): error C2133: 'Zeroes': unknown size
---

diff --git a/compiler-rt/lib/profile/InstrProfilingWriter.c b/compiler-rt/lib/profile/InstrProfilingWriter.c
index ae9e1fa..0b2e176 100644
--- a/compiler-rt/lib/profile/InstrProfilingWriter.c
+++ b/compiler-rt/lib/profile/InstrProfilingWriter.c
@@ -261,7 +261,7 @@ lprofWriteDataImpl(ProfDataWriter *Writer, const __llvm_profile_data *DataBegin,
 
   /* Enough zeroes for padding. */
   unsigned PageSize = getpagesize();
-  char Zeroes[PageSize];
+  char *Zeroes = (char *)COMPILER_RT_ALLOCA(PageSize);
   memset(Zeroes, 0, PageSize);
 
   /* Create the header. */