Skip to content

Commit 96fc08b

Browse files
committed
Address Michal's PR feedback, fix one unit test to avoid lab timeouts
1 parent d3a44b3 commit 96fc08b

File tree

4 files changed

+3
-15
lines changed

4 files changed

+3
-15
lines changed

src/coreclr/tools/Common/Compiler/GenericCycleDetection/ModuleCycleInfo.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@ public ModuleCycleInfo(EcmaModule module, HashSet<TypeSystemEntity> entitiesInCy
3030
{
3131
Module = module;
3232
_entitiesInCycles = entitiesInCycles;
33-
Console.WriteLine("Module: {0}", Module.Assembly.GetName().Name);
34-
foreach (TypeSystemEntity entity in _entitiesInCycles)
35-
{
36-
Console.WriteLine("-> {0}", entity);
37-
}
3833
}
3934

4035
public bool FormsCycle(TypeSystemEntity owner)

src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/MethodWithGCInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ protected override DependencyList ComputeNonRelocationBasedDependencies(NodeFact
280280
dependencyList.Add(node, "classMustBeLoadedBeforeCodeIsRun");
281281

282282
}
283-
catch (Exception)
283+
catch (TypeSystemException)
284284
{
285285
Console.WriteLine($"Info: Dependency `{node}` was dropped due to introducing a generic cycle.");
286286
}

src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCodegenCompilation.cs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,7 @@ public bool CanInline(MethodDesc caller, MethodDesc callee)
106106
}
107107
}
108108

109-
try
110-
{
111-
_nodeFactory.DetectGenericCycles(caller, callee);
112-
}
113-
catch (TypeSystemException)
114-
{
115-
return false;
116-
}
109+
_nodeFactory.DetectGenericCycles(caller, callee);
117110

118111
return NodeFactory.CompilationModuleGroup.CanInline(caller, callee);
119112
}

src/tests/readytorun/GenericCycleDetection/Breadth1Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<!-- This is an explicit crossgen test -->
66
<AlwaysUseCrossGen2>true</AlwaysUseCrossGen2>
77
<!-- Without this flag Crossgen2 crashes after several minutes with arithmetic overflow -->
8-
<CrossGen2TestExtraArguments>--enable-generic-cycle-detection --maxgenericcycle:-1 --maxgenericcyclebreadth:1</CrossGen2TestExtraArguments>
8+
<CrossGen2TestExtraArguments>--enable-generic-cycle-detection --maxgenericcycle:1 --maxgenericcyclebreadth:1</CrossGen2TestExtraArguments>
99
</PropertyGroup>
1010
<ItemGroup>
1111
<Compile Include="$(MSBuildProjectName).cs" />

0 commit comments

Comments
 (0)