Merge with latest code and PR feedback.

diff --git a/src/mscorlib/System.Private.CoreLib.csproj b/src/mscorlib/System.Private.CoreLib.csproj
index 6c08a12..771ea82 100644 (file)
--- a/src/mscorlib/System.Private.CoreLib.csproj
+++ b/src/mscorlib/System.Private.CoreLib.csproj
@@ -598,7 +598,7 @@
   </ItemGroup>
   <ItemGroup>
     <!--
-    These are files are also added to CoreLib.Shared.projitems, but they don't show up in
+    These files are also added to CoreLib.Shared.projitems, but they don't show up in
     Visual Studio Solution Explorer. Adding them here as well so developers can
     edit them and regenerate the .cs files.
     -->

diff --git a/src/mscorlib/shared/System.Private.CoreLib.Shared.projitems b/src/mscorlib/shared/System.Private.CoreLib.Shared.projitems
index 26b0ba6..4cde2f5 100644 (file)
--- a/src/mscorlib/shared/System.Private.CoreLib.Shared.projitems
+++ b/src/mscorlib/shared/System.Private.CoreLib.Shared.projitems
@@ -632,7 +632,6 @@
       <LastGenOutput>ConstantHelper.cs</LastGenOutput>
     </Content>
     <None Include="$(MSBuildThisFileDirectory)System\Numerics\GenerationConfig.ttinclude" />
-    <Compile Include="$(MSBuildThisFileDirectory)System\Numerics\JitIntrinsicAttribute.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Numerics\Register.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>

diff --git a/src/vm/jitinterface.cpp b/src/vm/jitinterface.cpp
index 0fb8ea6..78f3a51 100644 (file)
--- a/src/vm/jitinterface.cpp
+++ b/src/vm/jitinterface.cpp
@@ -8689,7 +8689,7 @@ CorInfoIntrinsics CEEInfo::getIntrinsicID(CORINFO_METHOD_HANDLE methodHnd,
 }
 
 /*********************************************************************/
-// This method should probably be renamed to something like "isSIMDType"
+// TODO: This method should probably be renamed to something like "isSIMDType"
 bool CEEInfo::isInSIMDModule(CORINFO_CLASS_HANDLE classHnd)
 {
 CONTRACTL {