From: Fadi Hanna <fadim@microsoft.com>
Date: Wed, 23 Mar 2016 22:58:49 +0000 (-0700)
Subject: Fix build break
X-Git-Tag: accepted/tizen/base/20180629.140029~5221^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5b799e7f91a1afe3d1450e37bfdaeda3b736e56b;p=platform%2Fupstream%2Fcoreclr.git

Fix build break
---

diff --git a/src/vm/clsload.cpp b/src/vm/clsload.cpp
index 363c4dc..dfe2f38 100644
--- a/src/vm/clsload.cpp
+++ b/src/vm/clsload.cpp
@@ -891,13 +891,13 @@ void ClassLoader::GetClassValue(NameHandleTable nhTable,
         if (pLookInThisModuleOnly && (pCurrentClsModule != pLookInThisModuleOnly))
             continue;
 
+#ifdef FEATURE_READYTORUN
         if (nhTable == nhCaseSensitive && pCurrentClsModule->IsReadyToRun() && pCurrentClsModule->GetReadyToRunInfo()->HasHashtableOfTypes())
         {
             // For R2R modules, we only search the hashtable of token types stored in the module's image, and don't fallback
             // to searching m_pAvailableClasses or m_pAvailableClassesCaseIns (in fact, we don't even allocate them for R2R modules).
             // Also note that type lookups in R2R modules only support case sensitive lookups.
 
-#ifdef FEATURE_READYTORUN
             mdToken mdFoundTypeToken;
             if (pCurrentClsModule->GetReadyToRunInfo()->TryLookupTypeTokenFromName(pName, &mdFoundTypeToken))
             {
@@ -915,15 +915,16 @@ void ClassLoader::GetClassValue(NameHandleTable nhTable,
 
                 return; // Return on the first success
             }
-#endif
         }
         else
+#endif
         {
             EEClassHashTable* pTable = NULL;
             if (nhTable == nhCaseSensitive)
             {
                 *ppTable = pTable = pCurrentClsModule->GetAvailableClassHash();
 
+#ifdef FEATURE_READYTORUN
                 if (pTable == NULL && pCurrentClsModule->IsReadyToRun() && !pCurrentClsModule->GetReadyToRunInfo()->HasHashtableOfTypes())
                 {
                     // Old R2R image generated without the hashtable of types.
@@ -933,6 +934,7 @@ void ClassLoader::GetClassValue(NameHandleTable nhTable,
                     needsToBuildHashtable = TRUE;
                     return;
                 }
+#endif
             }
             else
             {
diff --git a/src/vm/clsload.hpp b/src/vm/clsload.hpp
index c25978b..ca561a8 100644
--- a/src/vm/clsload.hpp
+++ b/src/vm/clsload.hpp
@@ -71,12 +71,9 @@ public:
     } TokenTypeEntry;
 
 private:
-    EntryType m_EntryType;
-    union
-    {
-        PTR_EEClassHashEntry    m_pClassHashEntry;
-        TokenTypeEntry          m_TokenAndModulePair;
-    };
+    EntryType               m_EntryType;
+    PTR_EEClassHashEntry    m_pClassHashEntry;
+    TokenTypeEntry          m_TokenAndModulePair;
 
 public:
     HashedTypeEntry()