Fix a conversion warning in the mingw32 build

gcc diagnoses this:
  warning: converting to non-pointer type 'unsigned int' from NULL

Also remove an empty statement.

No change in functionality.

llvm-svn: 192955
This commit is contained in:
Alp Toker 2013-10-18 07:53:25 +00:00
parent 742e6b8efd
commit 42235db0e9
1 changed files with 2 additions and 2 deletions

View File

@ -82,7 +82,7 @@ MemoryBlock Memory::allocateMappedMemory(size_t NumBytes,
uintptr_t Start = NearBlock ? reinterpret_cast<uintptr_t>(NearBlock->base()) +
NearBlock->size()
: NULL;
: 0;
// If the requested address is not aligned to the allocation granularity,
// round up to get beyond NearBlock. VirtualAlloc would have rounded down.
@ -106,7 +106,7 @@ MemoryBlock Memory::allocateMappedMemory(size_t NumBytes,
MemoryBlock Result;
Result.Address = PA;
Result.Size = NumBlocks*Granularity;
;
if (Flags & MF_EXEC)
Memory::InvalidateInstructionCache(Result.Address, Result.Size);