Skip to content

Fix syntax of exports file with no exported symbols on Linux #104339

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
jkotas merged 1 commit into from
Jul 9, 2024
Merged

Fix syntax of exports file with no exported symbols on Linux #104339

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 10 additions & 7 deletions src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/ExportsFileWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ namespace ILCompiler
public class ExportsFileWriter
{
private readonly string _exportsFile;
private readonly IEnumerable<string> _exportSymbols;
private readonly string[] _exportSymbols;
private readonly List<EcmaMethod> _methods;
private readonly TypeSystemContext _context;

public ExportsFileWriter(TypeSystemContext context, string exportsFile, IEnumerable<string> exportSymbols)
public ExportsFileWriter(TypeSystemContext context, string exportsFile, string[] exportSymbols)
{
_exportsFile = exportsFile;
_exportSymbols = exportSymbols;
Expand Down Expand Up @@ -51,11 +51,14 @@ public void EmitExportedMethods()
else
{
streamWriter.WriteLine("V1.0 {");
streamWriter.WriteLine(" global:");
foreach (string symbol in _exportSymbols)
streamWriter.WriteLine($" {symbol};");
foreach (var method in _methods)
streamWriter.WriteLine($" {method.GetUnmanagedCallersOnlyExportName()};");
if (_exportSymbols.Length != 0 || _methods.Count != 0)
{
streamWriter.WriteLine(" global:");
foreach (string symbol in _exportSymbols)
streamWriter.WriteLine($" {symbol};");
foreach (var method in _methods)
streamWriter.WriteLine($" {method.GetUnmanagedCallersOnlyExportName()};");
}
streamWriter.WriteLine(" local: *;");
streamWriter.WriteLine("};");
}
Expand Down