Make MappedFile::map return a const correct pointer, don't leak address space on Unix platforms.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@49026 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 3 insertions, 2 deletions

diff --git a/lib/System/Unix/MappedFile.inc b/lib/System/Unix/MappedFile.inc
index 92dc666..35efaa6 100644
--- a/lib/System/Unix/MappedFile.inc
+++ b/lib/System/Unix/MappedFile.inc
@@ -56,6 +56,7 @@ bool MappedFile::initialize(std::string* ErrMsg) {
 }
 
 void MappedFile::terminate() {
+  unmap();
   assert(MapInfo && "MappedFile not initialized");
   ::close(MapInfo->FD);
   delete MapInfo;
@@ -70,7 +71,7 @@ void MappedFile::unmap() {
   BasePtr = 0;  // Mark this as non-mapped.
 }
 
-void* MappedFile::map(std::string* ErrMsg) {
+const void* MappedFile::map(std::string* ErrMsg) {
   assert(MapInfo && "MappedFile not initialized");
   if (isMapped()) return BasePtr;
   
diff --git a/lib/System/Win32/MappedFile.inc b/lib/System/Win32/MappedFile.inc
index 830905d..4f30f56 100644
--- a/lib/System/Win32/MappedFile.inc
+++ b/lib/System/Win32/MappedFile.inc
@@ -75,7 +75,7 @@ void MappedFile::unmap() {
   }
 }
 
-void* MappedFile::map(std::string* ErrMsg) {
+const void* MappedFile::map(std::string* ErrMsg) {
   if (!isMapped()) {
     MapInfo->hMapping = CreateFileMapping(MapInfo->hFile, NULL, PAGE_READONLY,
                                           0, 0, NULL);