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 | 7a7fc90ba3419490c478174d78a3d1fb5373054d (patch) | |
| tree | 8501daa07779240357537d2937635324b83a0077 /lib/Support/Windows/Memory.inc | |
| parent | 8d433bd458b37327e2fa979a3234762f206b3467 (diff) | |
| download | external_llvm-7a7fc90ba3419490c478174d78a3d1fb5373054d.zip external_llvm-7a7fc90ba3419490c478174d78a3d1fb5373054d.tar.gz external_llvm-7a7fc90ba3419490c478174d78a3d1fb5373054d.tar.bz2 | |
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.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@192955 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Support/Windows/Memory.inc')
| -rw-r--r-- | lib/Support/Windows/Memory.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Support/Windows/Memory.inc b/lib/Support/Windows/Memory.inc index 4c5aebd..1260452 100644 --- a/lib/Support/Windows/Memory.inc +++ b/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); |