Add analyzer bootstrap phase

build.cmd

@@ -1,2 +1,2 @@
 @echo off
-powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -restore -build %*"
+powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\Build.ps1""" -restore -build %*"

build.sh

@@ -1,7 +1,27 @@
 #!/usr/bin/env bash
 
+# Stop script if unbound variable found (use ${var:-} if intentional)
+set -u
+
+# Stop script if subcommand fails
+set -e
+
 source="${BASH_SOURCE[0]}"
 
+bootstrap=false
+
+args=""
+while [[ $# > 0 ]]; do
+  opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")"
+  case "$opt" in
+    -integrationtest)
+      bootstrap=true
+      ;;
+  esac
+  args="$args $1"
+  shift
+done
+
 # resolve $SOURCE until the file is no longer a symlink
 while [[ -h $source ]]; do
   scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"

eng/Analyzers.props

@@ -4,4 +4,16 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="$(MicrosoftCodeAnalysisCSharpCodeStyleVersion)" PrivateAssets="all" />
     <!-- <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.205" PrivateAssets="all" /> -->
   </ItemGroup>
+
+  <Import Project="$(BootstrapBuildPath)/Microsoft.NET.ILLink.Analyzers.props" Condition="'$(BootstrapBuildPath)' != ''" />
+
+  <!-- Don't enable for Cecil, as they can't be suppressed -->
+  <PropertyGroup Condition="'$(BootstrapBuildPath)' != '' and '$(MSBuildProjectName)' != 'Mono.Cecil.Pdb'">
+    <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(BootstrapBuildPath)' != ''">
+    <Analyzer Include="$(BootstrapBuildPath)/ILLink.RoslynAnalyzer.dll" />
+  </ItemGroup>
+
 </Project>

eng/bootstrap.proj

@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.DotNet.Arcade.Sdk">
+
+    <Target Name="Build">
+        <MSBuild Projects="../src/ILLink.RoslynAnalyzer/ILLink.RoslynAnalyzer.csproj"
+                 Targets="Restore" />
+        <MSBuild Projects="../src/ILLink.RoslynAnalyzer/ILLink.RoslynAnalyzer.csproj"
+                 Properties="OutDir=$(ArtifactsDir)/bootstrap"
+                 Targets="Build" />
+    </Target>
+</Project>

eng/build.ps1

@@ -0,0 +1,19 @@
+[CmdletBinding(PositionalBinding=$false)]
+Param(
+  [switch] $integrationTest,
+  [Parameter(ValueFromRemainingArguments=$true)][String[]]$remaining
+)
+
+. (Join-Path $PSScriptRoot "common/tools.ps1")
+
+echo $ArtifactsDir
+
+$args = $remaining.Clone()
+
+if ($integrationTest) {
+    dotnet build (Join-Path $PSScriptRoot bootstrap.proj)
+    $args += "-integrationTest"
+    $args += "/p:BootstrapBuildPath=$ArtifactsDir/bootstrap"
+}
+
+powershell -ExecutionPolicy ByPass -NoProfile (Join-Path $PSScriptRoot "common/build.ps1") @args

eng/common/build.ps1

@@ -33,7 +33,7 @@ Param(
 # Unset 'Platform' environment variable to avoid unwanted collision in InstallDotNetCore.targets file
 # some computer has this env var defined (e.g. Some HP)
 if($env:Platform) {
-  $env:Platform=""  
+  $env:Platform=""
 }
 function Print-Usage() {
   Write-Host "Common settings:"
@@ -98,10 +98,10 @@ function Build {
     # Re-assign properties to a new variable because PowerShell doesn't let us append properties directly for unclear reasons.
     # Explicitly set the type as string[] because otherwise PowerShell would make this char[] if $properties is empty.
     [string[]] $msbuildArgs = $properties
-    
-    # Resolve relative project paths into full paths 
+
+    # Resolve relative project paths into full paths
     $projects = ($projects.Split(';').ForEach({Resolve-Path $_}) -join ';')
-    
+
     $msbuildArgs += "/p:Projects=$projects"
     $properties = $msbuildArgs
   }

src/ILLink.RoslynAnalyzer/RequiresAnalyzerBase.cs

@@ -172,10 +172,10 @@ public override void Initialize (AnalysisContext context)
 					for (int i = 0; i < typeParams.Length; i++) {
 						var typeParam = typeParams[i];
 						var typeArg = typeArgs[i];
-						if (!typeParam.HasConstructorConstraint)
+						if (!typeParam.HasConstructorConstraint ||
+							typeArg is not INamedTypeSymbol { InstanceConstructors: { } typeArgCtors })
 							continue;
 
-						var typeArgCtors = ((INamedTypeSymbol) typeArg).InstanceConstructors;
 						foreach (var instanceCtor in typeArgCtors) {
 							if (instanceCtor.Arity > 0)
 								continue;

src/linker/Linker.Steps/OutputStep.cs

@@ -174,8 +174,11 @@ private void OutputPInvokes ()
 
 			using (var fs = File.Open (Path.Combine (Context.OutputDirectory, Context.PInvokesListFile), FileMode.Create)) {
 				var values = Context.PInvokes.Distinct ().OrderBy (l => l);
+				// Ignore warning, since we're just enabling analyzer for dogfooding
+#pragma warning disable IL2026
 				var jsonSerializer = new DataContractJsonSerializer (typeof (List<PInvokeInfo>));
 				jsonSerializer.WriteObject (fs, values);
+#pragma warning restore IL2026
 			}
 		}
 

src/linker/Linker/Driver.cs

@@ -832,7 +832,11 @@ string Unquote (string arg)
 				if (File.Exists (assemblyPath)) {
 					// The CLR will return the already-loaded assembly if the same path is requested multiple times
 					// (or even if a different path specifies the "same" assembly, based on the MVID).
+
+					// Ignore warning, since we're just enabling analyzer for dogfooding
+#pragma warning disable IL2026
 					return AssemblyLoadContext.Default.LoadFromAssemblyPath (assemblyPath);
+#pragma warning restore IL2026
 				}
 				Context.LogError (null, DiagnosticId.AssemblyInCustomStepOptionCouldNotBeFound, arg);
 			} else
@@ -992,7 +996,10 @@ protected bool AddCustomStep (Pipeline pipeline, string arg)
 
 		Type? ResolveStepType (string type, Assembly assembly)
 		{
+			// Ignore warning, since we're just enabling analyzer for dogfooding
+#pragma warning disable IL2026
 			Type? step = assembly != null ? assembly.GetType (type) : Type.GetType (type, false);
+#pragma warning restore IL2026
 
 			if (step == null) {
 				Context.LogError (null, DiagnosticId.CustomStepTypeCouldNotBeFound, type);
@@ -1004,7 +1011,10 @@ protected bool AddCustomStep (Pipeline pipeline, string arg)
 
 		TStep? ResolveStep<TStep> (string type, Assembly assembly) where TStep : class
 		{
+			// Ignore warning, since we're just enabling analyzer for dogfooding
+#pragma warning disable IL2026
 			Type? step = assembly != null ? assembly.GetType (type) : Type.GetType (type, false);
+#pragma warning restore IL2026
 
 			if (step == null) {
 				Context.LogError (null, DiagnosticId.CustomStepTypeCouldNotBeFound, type);

test/Mono.Linker.Tests.Cases/RequiresCapability/BasicRequires.cs

@@ -5,6 +5,8 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Runtime.InteropServices;
@@ -190,9 +192,13 @@ public static void GenericTypeWithStaticMethodViaLdftn ()
 
 			class TestType { }
 
+			static T MakeNew<T> () where T : new() => new T ();
+			static T MakeNew2<T> () where T : new() => MakeNew<T> ();
+
 			public static void Test ()
 			{
 				GenericTypeWithStaticMethodViaLdftn ();
+				MakeNew2<TestType> ();
 			}
 		}
 	}