Minor V4 data structure cleanup

Remove unused flag that indicates whether a cache file contains
executable code. Since we don't embed executable code anymore we can get
rid of that along with the code that attempts to creat an executable
mapping.

Change-Id: I50e9770dc69b31319288a75379fd2f5db4c0a0f4
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

2 files changed, 3 insertions, 9 deletions

diff --git a/src/qml/compiler/qv4compilationunitmapper_win.cpp b/src/qml/compiler/qv4compilationunitmapper_win.cpp
index 8b000021f8..29e3e2ac01 100644
--- a/src/qml/compiler/qv4compilationunitmapper_win.cpp
+++ b/src/qml/compiler/qv4compilationunitmapper_win.cpp
@@ -90,14 +90,9 @@ CompiledData::Unit *CompilationUnitMapper::open(const QString &cacheFileName, co
     if (!header.verifyHeader(sourceTimeStamp, errorString))
         return nullptr;
 
-    const uint mappingFlags = header.flags & QV4::CompiledData::Unit::ContainsMachineCode
-                              ? PAGE_EXECUTE_READ : PAGE_READONLY;
-    const uint viewFlags = header.flags & QV4::CompiledData::Unit::ContainsMachineCode
-                           ? (FILE_MAP_READ | FILE_MAP_EXECUTE) : FILE_MAP_READ;
-
     // Data structure and qt version matched, so now we can access the rest of the file safely.
 
-    HANDLE fileMappingHandle = CreateFileMapping(handle, 0, mappingFlags, 0, 0, 0);
+    HANDLE fileMappingHandle = CreateFileMapping(handle, 0, PAGE_READONLY, 0, 0, 0);
     if (!fileMappingHandle) {
         *errorString = qt_error_string(GetLastError());
         return nullptr;
@@ -107,7 +102,7 @@ CompiledData::Unit *CompilationUnitMapper::open(const QString &cacheFileName, co
         CloseHandle(fileMappingHandle);
     });
 
-    dataPtr = MapViewOfFile(fileMappingHandle, viewFlags, 0, 0, 0);
+    dataPtr = MapViewOfFile(fileMappingHandle, FILE_MAP_READ, 0, 0, 0);
     if (!dataPtr) {
         *errorString = qt_error_string(GetLastError());
         return nullptr;
diff --git a/src/qml/compiler/qv4compileddata_p.h b/src/qml/compiler/qv4compileddata_p.h
index fff593941c..7f0b66c569 100644
--- a/src/qml/compiler/qv4compileddata_p.h
+++ b/src/qml/compiler/qv4compileddata_p.h
@@ -701,8 +701,7 @@ struct Unit
         StaticData = 0x4, // Unit data persistent in memory?
         IsSingleton = 0x8,
         IsSharedLibrary = 0x10, // .pragma shared?
-        ContainsMachineCode = 0x20, // used to determine if we need to mmap with execute permissions
-        PendingTypeCompilation = 0x40 // the QML data structures present are incomplete and require type compilation
+        PendingTypeCompilation = 0x20 // the QML data structures present are incomplete and require type compilation
     };
     quint32_le flags;
     quint32_le stringTableSize;