Cleanup

Author: A-And

src/jit/importer.cpp

@@ -19906,9 +19906,7 @@ void Compiler::impDevirtualizeCall(GenTreeCall*            call,
 
         // Look up the new call info.
         CORINFO_CALL_INFO derivedCallInfo;
-        eeGetCallInfo(&derivedResolvedToken, nullptr,
-                      addVerifyFlag(CORINFO_CALLINFO_ALLOWINSTPARAM),
-                      &derivedCallInfo);
+        eeGetCallInfo(&derivedResolvedToken, nullptr, addVerifyFlag(CORINFO_CALLINFO_ALLOWINSTPARAM), &derivedCallInfo);
 
         // Update the call.
         call->gtCallMoreFlags &= ~GTF_CALL_M_VIRTSTUB_REL_INDIRECT;

src/tools/crossgen/crossgen.cpp

@@ -34,7 +34,7 @@ enum ReturnValues
 #define NumItems(s) (sizeof(s) / sizeof(s[0]))
 
 STDAPI CreatePDBWorker(LPCWSTR pwzAssemblyPath, LPCWSTR pwzPlatformAssembliesPaths, LPCWSTR pwzTrustedPlatformAssemblies, LPCWSTR pwzPlatformResourceRoots, LPCWSTR pwzAppPaths, LPCWSTR pwzAppNiPaths, LPCWSTR pwzPdbPath, BOOL fGeneratePDBLinesInfo, LPCWSTR pwzManagedPdbSearchPath, LPCWSTR pwzPlatformWinmdPaths, LPCWSTR pwzDiasymreaderPath);
-STDAPI NGenWorker(LPCWSTR pwzFilename, DWORD dwFlags, LPCWSTR pwzPlatformAssembliesPaths, LPCWSTR pwzTrustedPlatformAssemblies, LPCWSTR pwzPlatformResourceRoots, LPCWSTR pwzAppPaths, LPCWSTR pwzOutputFilename=NULL, LPCWSTR pwzPlatformWinmdPaths=NULL, LPCWSTR pwzVersionBubbleAssemblyPaths=NULL, ICorSvcLogger *pLogger = NULL, LPCWSTR pwszCLRJITPath = nullptr);
+STDAPI NGenWorker(LPCWSTR pwzFilename, DWORD dwFlags, LPCWSTR pwzPlatformAssembliesPaths, LPCWSTR pwzTrustedPlatformAssemblies, LPCWSTR pwzPlatformResourceRoots, LPCWSTR pwzAppPaths, LPCWSTR pwzOutputFilename=NULL, LPCWSTR pwzPlatformWinmdPaths=NULL, ICorSvcLogger *pLogger = NULL, LPCWSTR pwszCLRJITPath = nullptr);
 void SetSvcLogger(ICorSvcLogger *pCorSvcLogger);
 void SetMscorlibPath(LPCWSTR wzSystemDirectory);
 
@@ -423,7 +423,6 @@ int _cdecl wmain(int argc, __in_ecount(argc) WCHAR **argv)
     LPCWSTR pwzPlatformAssembliesPaths = nullptr;
     LPCWSTR pwzPlatformWinmdPaths = nullptr;
     // TODO Add Variable Num of cli arguments
-    LPCWSTR pwzVersionBubbleAssemblyPaths = nullptr;
     StackSString wzDirectoryToStorePDB;
     bool fCreatePDB = false;
     bool fGeneratePDBLinesInfo = false;
@@ -474,7 +473,7 @@ int _cdecl wmain(int argc, __in_ecount(argc) WCHAR **argv)
 
     // By default, Crossgen will generate readytorun images unless /FragileNonVersionable switch is specified
     dwFlags |= NGENWORKER_FLAGS_READYTORUN;
-
+    dwFlags |= NGENWORKER_FLAGS_LARGEVERSIONBUBBLE;
     while (argc > 0)
     {
         // Command-line parsing
@@ -533,6 +532,7 @@ int _cdecl wmain(int argc, __in_ecount(argc) WCHAR **argv)
         else if (MatchParameter(*argv, W("LargeVersionBubble")))
         {
             dwFlags |= NGENWORKER_FLAGS_LARGEVERSIONBUBBLE;
+            fLargeVersionBubbleSwitch = true;
         }
 #endif
         else if (MatchParameter(*argv, W("NoMetaData")))
@@ -599,14 +599,6 @@ int _cdecl wmain(int argc, __in_ecount(argc) WCHAR **argv)
         {
             pwzPlatformAssembliesPaths = argv[1];
 
-            // skip path list
-            argv++;
-            argc--;
-        }
-        else if (MatchParameter(*argv, W("Version_Bubble_Assembly_Paths")) && (argc > 1))
-        {
-            pwzVersionBubbleAssemblyPaths = argv[1];
-            
             // skip path list
             argv++;
             argc--;
@@ -933,8 +925,7 @@ int _cdecl wmain(int argc, __in_ecount(argc) WCHAR **argv)
          pwzPlatformResourceRoots,
          pwzAppPaths,
          pwzOutputFilename,
-         pwzPlatformWinmdPaths,
-         pwzVersionBubbleAssemblyPaths
+         pwzPlatformWinmdPaths
 #if !defined(FEATURE_MERGE_JIT_AND_ENGINE)
         ,
         NULL, // ICorSvcLogger

src/vm/ceeload.h

@@ -2393,7 +2393,6 @@ class Module
         CrstHolder ch(this->GetLookupTableCrst());
         m_pMemberRefToDescHashTable->Insert(token, value);
     }
-    // This call
     void StoreMemberRef(mdMemberRef token, MethodDesc *value)
     {
         WRAPPER_NO_CONTRACT;

src/vm/readytoruninfo.cpp

@@ -455,7 +455,6 @@ PTR_ReadyToRunInfo ReadyToRunInfo::Initialize(Module * pModule, AllocMemTracker
     STANDARD_VM_CONTRACT;
 
     PEFile * pFile = pModule->GetFile();
-    // ?
     if (!IsReadyToRunEnabled())
     {
         // Log message is ignored in this case.

src/vm/readytoruninfo.h

@@ -43,7 +43,6 @@ class ReadyToRunInfo
     NativeFormat::NativeArray       m_methodDefEntryPoints;
     NativeFormat::NativeHashtable   m_instMethodEntryPoints;
     NativeFormat::NativeHashtable   m_availableTypesHashtable;
-    // TODO Should this be a hash table? 
     NativeFormat::NativeHashtable   m_pMetaDataHashtable;
 
     Crst                            m_Crst;

src/vm/zapsig.cpp

@@ -781,9 +781,9 @@ Module *ZapSig::DecodeModuleFromIndexIfLoaded(Module *fromModule,
 
 
 TypeHandle ZapSig::DecodeType(Module *pEncodeModuleContext,
-    Module *pInfoModule,
-    PCCOR_SIGNATURE pBuffer,
-    ClassLoadLevel level)
+                              Module *pInfoModule,
+                              PCCOR_SIGNATURE pBuffer,
+                              ClassLoadLevel level)
 {
     CONTRACTL
     {
@@ -879,6 +879,7 @@ MethodDesc *ZapSig::DecodeMethod(Module *pReferencingModule,
         //
         RID rid;
         IfFailThrow(sig.GetData(&rid));
+
         if (methodFlags & ENCODE_METHOD_SIG_MemberRefToken)
         {
             if (thOwner.IsNull())
@@ -1201,7 +1202,6 @@ BOOL ZapSig::EncodeMethod(
             // GetSvcLogger()->Printf(W("ReadyToRun: Method reference outside of current version bubble cannot be encoded\n"));
             ThrowHR(E_FAIL);
         }
-        //_ASSERTE(pReferencingModule == GetAppDomain()->ToCompilationDomain()->GetTargetModule());
 
         methodToken = pResolvedToken->token;
 

src/zap/zapimage.cpp

@@ -1833,7 +1833,6 @@ void ZapImage::Compile()
         OutputInliningTableForReadyToRun();
         OutputProfileDataForReadyToRun();
         OutputManifestMetadataForReadyToRun();
-
     }
     else
 #endif

src/zap/zapimport.cpp

@@ -941,7 +941,6 @@ ZapImport * ZapImportTable::GetExistingMethodHandleImport(CORINFO_METHOD_HANDLE
 
 CORINFO_MODULE_HANDLE ZapImportTable::TryEncodeModule(CORCOMPILE_FIXUP_BLOB_KIND kind, CORINFO_MODULE_HANDLE module, SigBuilder * pSigBuilder)
 {
-    // Use def tokens and module references? 
     if (!GetCompileInfo()->IsInCurrentVersionBubble(module))
         module = GetImage()->GetModuleHandle();
 
@@ -990,7 +989,6 @@ void ZapImportTable::EncodeMethod(CORCOMPILE_FIXUP_BLOB_KIND kind, CORINFO_METHO
     CORINFO_CLASS_HANDLE clsHandle = GetJitInfo()->getMethodClass(handle);
     CORINFO_MODULE_HANDLE referencingModule = GetJitInfo()->getClassModule(clsHandle);
     referencingModule = TryEncodeModule(kind, referencingModule, pSigBuilder);
-
     GetCompileInfo()->EncodeMethod(referencingModule, handle, pSigBuilder, this, EncodeModuleHelper,
         pResolvedToken, pConstrainedResolvedToken, fEncodeUsingResolvedTokenSpecStreams);
 }
@@ -1847,7 +1845,6 @@ ZapImport * ZapImportTable::GetDynamicHelperCell(CORCOMPILE_FIXUP_BLOB_KIND kind
         sigBuilder.AppendData(kind & ~CORINFO_HELP_READYTORUN_ATYPICAL_CALLSITE);
 
         GetCompileInfo()->EncodeClass(m_pImage->GetModuleHandle(), handle, &sigBuilder, this, EncodeModuleHelper);
-        // CHANGE IT HERE
         pImport->SetBlob(GetBlob(&sigBuilder));
     }
 

src/zap/zapinfo.cpp

@@ -1425,12 +1425,6 @@ CORINFO_MODULE_HANDLE ZapInfo::embedModuleHandle(CORINFO_MODULE_HANDLE handle,
 {
     _ASSERTE(ppIndirection != NULL);
 
-    //if (IsReadyToRunCompilation())
-    //{
-    //    _ASSERTE(!"embedModuleHandle");
-    //    ThrowHR(E_NOTIMPL);
-    //}
-
     BOOL fHardbound = m_pImage->m_pPreloader->CanEmbedModuleHandle(handle);
     if (fHardbound)
     {

src/zap/zapper.cpp

@@ -33,7 +33,7 @@ static bool s_fNGenNoMetaData;
 // Zapper Object instead of creating one on your own.
 
 
-STDAPI NGenWorker(LPCWSTR pwzFilename, DWORD dwFlags, LPCWSTR pwzPlatformAssembliesPaths, LPCWSTR pwzTrustedPlatformAssemblies, LPCWSTR pwzPlatformResourceRoots, LPCWSTR pwzAppPaths, LPCWSTR pwzOutputFilename=NULL, LPCWSTR pwzPlatformWinmdPaths=NULL, LPCWSTR pwzVersionBubbleAssemblyPaths=NULL, ICorSvcLogger *pLogger = NULL, LPCWSTR pwszCLRJITPath = nullptr)
+STDAPI NGenWorker(LPCWSTR pwzFilename, DWORD dwFlags, LPCWSTR pwzPlatformAssembliesPaths, LPCWSTR pwzTrustedPlatformAssemblies, LPCWSTR pwzPlatformResourceRoots, LPCWSTR pwzAppPaths, LPCWSTR pwzOutputFilename=NULL, LPCWSTR pwzPlatformWinmdPaths=NULL, ICorSvcLogger *pLogger = NULL, LPCWSTR pwszCLRJITPath = nullptr)
 {    
     HRESULT hr = S_OK;