Make PEImage Size/UncompressedSize getters more explicit

Author: elinor-fung

src/coreclr/inc/bundle.h

@@ -19,15 +19,15 @@ struct BundleFileLocation
 {
     INT64 Size;
     INT64 Offset;
-    INT64 UncompresedSize;
+    INT64 UncompressedSize;
 
     BundleFileLocation()
     {
         LIMITED_METHOD_CONTRACT;
 
         Size = 0;
         Offset = 0;
-        UncompresedSize = 0;
+        UncompressedSize = 0;
     }
 
     static BundleFileLocation Invalid() { LIMITED_METHOD_CONTRACT; return BundleFileLocation(); }

src/coreclr/vm/bundle.cpp

@@ -88,12 +88,12 @@ BundleFileLocation Bundle::Probe(const SString& path, bool pathIsBundleRelative)
         if (compressedSize)
         {
             loc.Size = compressedSize;
-            loc.UncompresedSize = fileSize;
+            loc.UncompressedSize = fileSize;
         }
         else
         {
             loc.Size = fileSize;
-            loc.UncompresedSize = 0;
+            loc.UncompressedSize = 0;
         }
 
         return loc;

src/coreclr/vm/hostinformation.cpp

@@ -54,4 +54,4 @@ bool HostInformation::ExternalAssemblyProbe(_In_ const SString& path, _Out_ void
     StackSString utf8Path;
     utf8Path.SetAndConvertToUTF8(path.GetUnicode());
     return s_hostContract->external_assembly_probe(utf8Path.GetUTF8(), data, size);
-}
+}

src/coreclr/vm/peimage.h

@@ -142,7 +142,7 @@ class PEImage final
     void* GetExternalData(INT64* size);
     INT64 GetOffset() const;
     INT64 GetSize() const;
-    INT64 GetUncompressedSize() const;
+    BOOL IsCompressed(INT64* uncompressedSize = NULL) const;
 
     HANDLE GetFileHandle();
     HRESULT TryOpenFile(bool takeLock = false);

src/coreclr/vm/peimage.inl

@@ -44,7 +44,7 @@ inline void* PEImage::GetExternalData(INT64* size)
     LIMITED_METHOD_CONTRACT;
 
     _ASSERTE(size != nullptr);
-    if (m_probeExtensionResult.Type != ProbeExtensionResult::Type::External)
+    if (!IsExternalData())
     {
         *size = 0;
         return nullptr;
@@ -58,7 +58,7 @@ inline INT64 PEImage::GetOffset() const
 {
     LIMITED_METHOD_CONTRACT;
 
-    return m_probeExtensionResult.BundleLocation.Offset;
+    return IsInBundle() ? m_probeExtensionResult.BundleLocation.Offset : 0;
 }
 
 inline BOOL PEImage::IsInBundle() const
@@ -77,14 +77,26 @@ inline BOOL PEImage::IsExternalData() const
 
 inline INT64 PEImage::GetSize() const
 {
-    LIMITED_METHOD_CONTRACT;
-    return m_probeExtensionResult.BundleLocation.Size;
+    if (!m_probeExtensionResult.IsValid())
+
+    if (IsInBundle())
+        return m_probeExtensionResult.BundleLocation.Size;
+
+    if (IsExternalData())
+        return m_probeExtensionResult.ExternalData.Size;
+
+    // Size is not specified
+    return 0;
 }
 
-inline INT64 PEImage::GetUncompressedSize() const
+inline BOOL PEImage::IsCompressed(INT64* uncompressedSize) const
 {
     LIMITED_METHOD_CONTRACT;
-    return m_probeExtensionResult.BundleLocation.UncompresedSize;
+
+    if (uncompressedSize != NULL)
+        *uncompressedSize = IsInBundle() ? m_probeExtensionResult.BundleLocation.UncompressedSize : 0;
+
+    return IsInBundle() && m_probeExtensionResult.BundleLocation.UncompressedSize != 0;
 }
 
 inline void PEImage::SetModuleFileNameHintForDAC()
@@ -120,7 +132,7 @@ inline const SString &PEImage::GetModuleFileNameHintForDAC()
 inline BOOL PEImage::IsFile()
 {
     WRAPPER_NO_CONTRACT;
-    return m_probeExtensionResult.Type != ProbeExtensionResult::Type::External && !GetPathToLoad().IsEmpty();
+    return !IsExternalData() && !GetPathToLoad().IsEmpty();
 }
 
 //

src/coreclr/vm/peimagelayout.cpp

@@ -124,7 +124,7 @@ PEImageLayout* PEImageLayout::Load(PEImage* pOwner, HRESULT* loadFailure)
     {
         if (!pOwner->IsInBundle()
 #if defined(TARGET_UNIX)
-            || (pOwner->GetUncompressedSize() == 0)
+            || !pOwner->IsCompressed()
 #endif
             )
         {
@@ -537,7 +537,7 @@ LoadedImageLayout::LoadedImageLayout(PEImage* pOwner, HRESULT* loadFailure)
     CONTRACTL_END;
 
     m_pOwner = pOwner;
-    _ASSERTE(pOwner->GetUncompressedSize() == 0);
+    _ASSERTE(!pOwner->IsCompressed());
 
 #ifndef TARGET_UNIX
     _ASSERTE(!pOwner->IsInBundle());
@@ -670,12 +670,13 @@ FlatImageLayout::FlatImageLayout(PEImage* pOwner)
     // It's okay if resource files are length zero
     if (size > 0)
     {
-        INT64 uncompressedSize = pOwner->GetUncompressedSize();
+        INT64 uncompressedSize;
+        BOOL isCompressed = pOwner->IsCompressed(&uncompressedSize);
 
         DWORD mapAccess = PAGE_READONLY;
 #if !defined(TARGET_UNIX)
         // to map sections into executable views on Windows the mapping must have EXECUTE permissions
-        if (uncompressedSize == 0)
+        if (!isCompressed)
         {
             mapAccess = PAGE_EXECUTE_READ;
         }
@@ -701,7 +702,7 @@ FlatImageLayout::FlatImageLayout(PEImage* pOwner)
         m_FileView.Assign(view);
         addr = (LPVOID)((size_t)view + offset - mapBegin);
 
-        if (uncompressedSize > 0)
+        if (isCompressed)
         {
 #if defined(CORECLR_EMBEDDED)
             // The mapping we have just created refers to the region in the bundle that contains compressed data.
@@ -1031,7 +1032,7 @@ void* FlatImageLayout::LoadImageByMappingParts(SIZE_T* m_imageParts) const
     }
     CONTRACTL_END;
 
-    if (!HavePlaceholderAPI() || m_pOwner->GetUncompressedSize() != 0)
+    if (!HavePlaceholderAPI() || m_pOwner->IsCompressed())
     {
         return NULL;
     }