Skip to content

Fix build issues with clang18 #94782

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkotas merged 5 commits into from
Nov 16, 2023
Merged

Fix build issues with clang18 #94782

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2b5a766
Fixed build issues with clang18
Raphtaliyah Nov 15, 2023
f706984
Revert disabling warnings for VLAs
Raphtaliyah Nov 16, 2023
0e81b08
Convert use of VLAs to alloca
Raphtaliyah Nov 16, 2023
56db521
Enable warnings for VLAs
Raphtaliyah Nov 16, 2023
a647c67
Convert VLA to alloca in Apple specific code
Raphtaliyah Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Convert use of VLAs to alloca
  • Loading branch information
@Raphtaliyah
Raphtaliyah committed Nov 16, 2023
commit 0e81b08620d3565cb1b04c99c39946d2fee6bcf7
10 changes: 5 additions & 5 deletions src/coreclr/gc/unix/gcenv.unix.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,9 +631,9 @@ bool GCToOSInterface::VirtualCommit(void* address, size_t size, uint16_t node)
if ((int)node <= g_highestNumaNode)
{
int usedNodeMaskBits = g_highestNumaNode + 1;
int nodeMaskLength = (usedNodeMaskBits + sizeof(unsigned long) - 1) / sizeof(unsigned long);
unsigned long nodeMask[nodeMaskLength];
memset(nodeMask, 0, sizeof(nodeMask));
int nodeMaskLength = usedNodeMaskBits + sizeof(unsigned long) - 1;
unsigned long* nodeMask = (unsigned long*)alloca(nodeMaskLength);
memset(nodeMask, 0, nodeMaskLength);

int index = node / sizeof(unsigned long);
nodeMask[index] = ((unsigned long)1) << (node & (sizeof(unsigned long) - 1));
Expand Down Expand Up @@ -1189,10 +1189,10 @@ uint64_t GetAvailablePhysicalMemory()
#elif defined(__FreeBSD__)
size_t inactive_count = 0, laundry_count = 0, free_count = 0;
size_t sz = sizeof(inactive_count);
sysctlbyname("vm.stats.vm.v_inactive_count", &inactive_count, &sz, NULL, 0);
sysctlbyname("vm.stats.vm.v_inactive_count", &inactive_count, &sz, NULL, 0);

sz = sizeof(laundry_count);
sysctlbyname("vm.stats.vm.v_laundry_count", &laundry_count, &sz, NULL, 0);
sysctlbyname("vm.stats.vm.v_laundry_count", &laundry_count, &sz, NULL, 0);

sz = sizeof(free_count);
sysctlbyname("vm.stats.vm.v_free_count", &free_count, &sz, NULL, 0);
Expand Down
6 changes: 3 additions & 3 deletions src/coreclr/pal/src/file/path.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,8 +399,8 @@ GetTempPathW(
return 0;
}

char TempBuffer[nBufferLength > 0 ? nBufferLength : 1];
DWORD dwRetVal = GetTempPathA( nBufferLength, TempBuffer );
char* tempBuffer = (char*)alloca(nBufferLength > 0 ? nBufferLength : 1);
DWORD dwRetVal = GetTempPathA( nBufferLength, tempBuffer );

if ( dwRetVal >= nBufferLength )
{
Expand All @@ -411,7 +411,7 @@ GetTempPathW(
else if ( dwRetVal != 0 )
{
/* Convert to wide. */
if ( 0 == MultiByteToWideChar( CP_ACP, 0, TempBuffer, -1,
if ( 0 == MultiByteToWideChar( CP_ACP, 0, tempBuffer, -1,
lpBuffer, dwRetVal + 1 ) )
{
ASSERT( "An error occurred while converting the string to wide.\n" );
Expand Down