Skip to content

Fix a problem where generating an empty FS assembly element roots the whole assembly #2051

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 24, 2021
Merged

Fix a problem where generating an empty FS assembly element roots the whole assembly #2051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6108202
Fix a problem where generating an empty FS assembly element roots the…
vitek-karas May 24, 2021
8b4ae96
Formatting
vitek-karas May 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions src/ILLink.Tasks/CreateRuntimeRootDescriptorFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Xml;
using Microsoft.Build.Framework; // ITaskItem
using Microsoft.Build.Utilities; // Task
Expand Down Expand Up @@ -301,26 +302,29 @@ void OutputXml (string iLLinkTrimXmlFilePath, string outputFileName)
XmlNode linkerNode = doc["linker"];

if (featureSwitchMembers.Count > 0) {
foreach (var fsMembers in featureSwitchMembers.Keys) {
foreach ((var fs, var members) in featureSwitchMembers.Select (kv => (kv.Key, kv.Value))) {
if (members.Count == 0)
continue;

// <assembly fullname="System.Private.CoreLib" feature="System.Diagnostics.Tracing.EventSource.IsSupported" featurevalue="true" featuredefault="true">
XmlNode featureAssemblyNode = doc.CreateElement ("assembly");
XmlAttribute featureAssemblyFullName = doc.CreateAttribute ("fullname");
featureAssemblyFullName.Value = "System.Private.CoreLib";
featureAssemblyNode.Attributes.Append (featureAssemblyFullName);

XmlAttribute featureName = doc.CreateAttribute ("feature");
featureName.Value = fsMembers.Feature;
featureName.Value = fs.Feature;
featureAssemblyNode.Attributes.Append (featureName);

XmlAttribute featureValue = doc.CreateAttribute ("featurevalue");
featureValue.Value = fsMembers.FeatureValue;
featureValue.Value = fs.FeatureValue;
featureAssemblyNode.Attributes.Append (featureValue);

XmlAttribute featureDefault = doc.CreateAttribute ("featuredefault");
featureDefault.Value = fsMembers.FeatureDefault;
featureDefault.Value = fs.FeatureDefault;
featureAssemblyNode.Attributes.Append (featureDefault);

foreach (var type in featureSwitchMembers[fsMembers]) {
foreach (var type in members) {
AddXmlTypeNode (doc, featureAssemblyNode, type.Key, type.Value);
}
linkerNode.AppendChild (featureAssemblyNode);
Expand Down
6 changes: 6 additions & 0 deletions test/ILLink.Tasks.Tests/CreateRuntimeRootDescriptorFileTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,12 @@ public void TestCoreLibClassGenWithFeatureSwitch ()
"#if FOR_ILLINK",
"DEFINE_METHOD(TESTCLASS, TESTMETHODFORILLINK, TestMethodForILLink, 5)",
"#endif",
"END_ILLINK_FEATURE_SWITCH()",
"BEGIN_ILLINK_FEATURE_SWITCH(TestFeature2Name, false, false)",
"#ifdef FEATURE_OFF",
"DEFINE_CLASS(TESTCLASS)",
"DEFINE_METHOD(TESTCLASS, TESTMETHODFEATURE2, TestMethodFeature2, 6)",
"#endif",
"END_ILLINK_FEATURE_SWITCH()"
});

Expand Down