diff options
| author | Alp Toker <alp@nuanti.com> | 2013-10-18 07:53:25 +0000 |
|---|---|---|
| committer | Alp Toker <alp@nuanti.com> | 2013-10-18 07:53:25 +0000 |
| commit | 42235db0e94dbff295a9f8ccfe62efd928d402ca (patch) | |
| tree | 7344a7a21dd8440a5e751d21d7f50f4f875c4c35 /llvm/lib/Support | |
| parent | 742e6b8efda3b2c024ec6f26656e9b408bef445e (diff) | |
| download | bcm5719-llvm-42235db0e94dbff295a9f8ccfe62efd928d402ca.tar.gz bcm5719-llvm-42235db0e94dbff295a9f8ccfe62efd928d402ca.zip | |
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
Diffstat (limited to 'llvm/lib/Support')
| -rw-r--r-- | llvm/lib/Support/Windows/Memory.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/Support/Windows/Memory.inc b/llvm/lib/Support/Windows/Memory.inc index 4c5aebd5e71..12604524d40 100644 --- a/llvm/lib/Support/Windows/Memory.inc +++ b/llvm/lib/Support/Windows/Memory.inc @@ -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); |
