Cleanup

Author: A-And

src/jit/importer.cpp

@@ -19907,6 +19907,7 @@ void Compiler::impMarkInlineCandidateHelper(GenTreeCall*           call,
         inlineResult.NoteFatal(InlineObservation::CALLSITE_IS_CALL_TO_HELPER);
         return;
     }
+
     /* Ignore indirect calls */
     if (call->gtCallType == CT_INDIRECT)
     {

src/tools/crossgen/crossgen.cpp

@@ -106,7 +106,6 @@ void PrintUsageHelper()
     Output(
        W("Usage: crossgen [args] <assembly name>\n")
        W("\n")
-       // Command-Line switch help
        W("    /? or /help          - Display this screen\n")
        W("    /nologo              - Prevents displaying the logo\n")
        W("    /silent              - Do not display completion message\n")
@@ -122,8 +121,6 @@ void PrintUsageHelper()
        W("                         - List of paths containing localized assembly directories\n")
        W("    /App_Paths <path[") PATH_SEPARATOR_STR_W W("path]>\n")
        W("                         - List of paths containing user-application assemblies and resources\n")
-       W("    /Version_Bubble_Assembly_Paths <path[") PATH_SEPARATOR_STR_W W("path]>\n")
-       W("                         - List of paths containing assemblies contained in a single version bubble\n")
 #ifndef NO_NGENPDB
        W("    /App_Ni_Paths <path[") PATH_SEPARATOR_STR_W W("path]>\n")
        W("                         - List of paths containing user-application native images\n")
@@ -474,7 +471,6 @@ int _cdecl wmain(int argc, __in_ecount(argc) WCHAR **argv)
     dwFlags |= NGENWORKER_FLAGS_READYTORUN;
     while (argc > 0)
     {
-        // Command-line parsing
         if (MatchParameter(*argv, W("?"))
             || MatchParameter(*argv, W("help")))
         {

src/tools/r2rdump/R2RSection.cs

@@ -28,7 +28,6 @@ public enum SectionType
             READYTORUN_SECTION_INSTANCE_METHOD_ENTRYPOINTS = 109,
             READYTORUN_SECTION_INLINING_INFO = 110,
             READYTORUN_SECTION_PROFILEDATA_INFO = 111,
-            READYTORUN_SECTION_MANIFEST_METADATA = 112  // Added in V2.2
         }
 
         /// <summary>

src/utilcode/pedecoder.cpp

@@ -2474,6 +2474,8 @@ CORCOMPILE_METHOD_PROFILE_LIST *PEDecoder::GetNativeProfileDataList(COUNT_T * pS
     RETURN PTR_CORCOMPILE_METHOD_PROFILE_LIST(GetDirectoryData(pDir));
 }
 
+
+
 PTR_CVOID PEDecoder::GetNativeManifestMetadata(COUNT_T *pSize) const
 {
     CONTRACT(PTR_CVOID)

src/vm/ceeload.cpp

@@ -10054,7 +10054,8 @@ IMDInternalImport *Module::GetNativeAssemblyImport(BOOL loadAllowed)
         POSTCONDITION(CheckPointer(RETVAL));
     }
     CONTRACT_END;
-    // Check if Image is even R2R?
+
+    // Check if image is R2R
     if (GetFile()->IsILImageReadyToRun())
     {
         RETURN GetFile()->GetOpenedILimage()->GetNativeMDImport(loadAllowed);

src/vm/jitinterface.cpp

@@ -676,8 +676,7 @@ BOOL CEEInfo::shouldEnforceCallvirtRestriction(
 // and the impact of the cut was vetted with partners. It would not be appropriate 
 // to increase that unreported set without additional review.
 
-// This needs to be updated to allow cross-assembly inlining
-// TODO Undo this once prototyping is finished
+
 bool IsInSameVersionBubble(Assembly * current, Assembly * target)
 {
     LIMITED_METHOD_CONTRACT;

src/vm/peimage.cpp

@@ -467,7 +467,7 @@ IMDInternalImport* PEImage::GetNativeMDImport(BOOL loadAllowed)
         MODE_ANY;
     }
     CONTRACTL_END;
-    // Does this need to be something else? It might work either way
+
     if (m_pNativeMDImport == NULL)
     {
         if (loadAllowed)

src/vm/readytoruninfo.cpp

@@ -620,8 +620,7 @@ ReadyToRunInfo::ReadyToRunInfo(Module * pModule, PEImageLayout * pLayout, READYT
         }
     }
 
-    // TODO Change to incremented version
-    if (IsLargeVersionBubbleEnabled() && IsImageVersionAtLeast(2, 2))
+    if (IsLargeVersionBubbleEnabled())
     {
         IMAGE_DATA_DIRECTORY * pManifestMetadata = FindSection(READYTORUN_SECTION_MANIFEST_METADATA);
         if (pManifestMetadata != NULL)

src/zap/zapimage.cpp

@@ -1082,7 +1082,10 @@ HANDLE ZapImage::GenerateFile(LPCWSTR wszOutputFileName, CORCOMPILE_NGEN_SIGNATU
 
 HANDLE ZapImage::SaveImage(LPCWSTR wszOutputFileName, LPCWSTR wszDllPath, CORCOMPILE_NGEN_SIGNATURE * pNativeImageSig)
 {
-    OutputManifestMetadata();
+    if(IsLargeVersionBubbleEnabled())
+    {
+        OutputManifestMetadata();
+    }
 
     OutputTables();
 

tests/src/readytorun/tests/versionbubbles/helper.cs

@@ -10,4 +10,4 @@ public string GetLastMethodName()
         StackTrace st = new StackTrace();
         return st.GetFrame(0).GetMethod().Name;
     }
-}
+}