Skip to content

Fix NULL conversion warnings found in Alpine x64 Source-Build #100796

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
jkoritzinsky merged 10 commits into from
Apr 13, 2024
Merged

Fix NULL conversion warnings found in Alpine x64 Source-Build #100796

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
086f19f
Fix NULL conversion warnings found in Alpine x64 Source-Build
jkoritzinsky Apr 8, 2024
13cb6e6
Use delgating constructors to simplify DAC pointer types.
jkoritzinsky Apr 11, 2024
4eba0c0
Consolidate code in the DACized pointer types and fix the nullptr/NUL…
jkoritzinsky Apr 11, 2024
2f7c5a9
Define nullptr helpers for our checked objref types like our dacized …
jkoritzinsky Apr 11, 2024
9c2e7cb
Fixes for the glibc-based build
jkoritzinsky Apr 11, 2024
138eefb
Convert some of the 0s back to NULLs
jkoritzinsky Apr 11, 2024
098dbaa
Apply suggestions
jkoritzinsky Apr 12, 2024
8dd2b41
MSVC requires explicitly-defaulted default constructors when using de…
jkoritzinsky Apr 12, 2024
c26d61d
Fix typo in comment about NULL pattern
jkoritzinsky Apr 12, 2024
506c922
Fix cast
jkoritzinsky Apr 12, 2024
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
Fixes for the glibc-based build
  • Loading branch information
@jkoritzinsky
jkoritzinsky committed Apr 11, 2024
commit 9c2e7cb796711d021f56f9aa4edfe9714749f667
12 changes: 6 additions & 6 deletions src/coreclr/utilcode/loaderheap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ void RangeList::InitBlock(RangeListBlock *b)
while (r < rEnd)
r++->id = (TADDR)NULL;

b->next = nullptr;
b->next = NULL;
}

BOOL RangeList::AddRangeWorker(const BYTE *start, const BYTE *end, void *id)
Expand All @@ -92,7 +92,7 @@ BOOL RangeList::AddRangeWorker(const BYTE *start, const BYTE *end, void *id)
}
CONTRACTL_END

_ASSERTE(id != (TADDR)NULL);
_ASSERTE(id != NULL);

RangeListBlock *b = m_firstEmptyBlock;
Range *r = b->ranges + m_firstEmptyRange;
Expand Down Expand Up @@ -123,7 +123,7 @@ BOOL RangeList::AddRangeWorker(const BYTE *start, const BYTE *end, void *id)
// new one.
//

if (b->next == nullptr)
if (b->next == NULL)
{
RangeListBlock *newBlock = new (nothrow) RangeListBlock;

Expand All @@ -136,7 +136,7 @@ BOOL RangeList::AddRangeWorker(const BYTE *start, const BYTE *end, void *id)

InitBlock(newBlock);

newBlock->next = nullptr;
newBlock->next = NULL;
b->next = newBlock;
}

Expand Down Expand Up @@ -204,7 +204,7 @@ void RangeList::RemoveRangesWorker(void *id, const BYTE* start, const BYTE* end)
// If there are no more blocks, we're done.
//

if (b->next == nullptr)
if (b->next == NULL)
{
m_firstEmptyRange = 0;
m_firstEmptyBlock = &m_starterBlock;
Expand Down Expand Up @@ -266,7 +266,7 @@ BOOL RangeList::IsInRangeWorker(TADDR address, TADDR *pID /* = NULL */)
// If there are no more blocks, we're done.
//

if (b->next == nullptr)
if (b->next == NULL)
return FALSE;

//
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/vm/object.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2455,7 +2455,7 @@ class Nullable {
static BOOL UnBox(void* dest, OBJECTREF boxedVal, MethodTable* destMT);
static BOOL UnBoxNoGC(void* dest, OBJECTREF boxedVal, MethodTable* destMT);
static void UnBoxNoCheck(void* dest, OBJECTREF boxedVal, MethodTable* destMT);
static OBJECTREF BoxedNullableNull(TypeHandle nullableType) { return nullptr; }
static OBJECTREF BoxedNullableNull(TypeHandle nullableType) { return NULL; }

// if 'Obj' is a true boxed nullable, return the form we want (either null or a boxed T)
static OBJECTREF NormalizeBox(OBJECTREF obj);
Expand Down