Skip to content

Make ControlFlowBuilder.Clear public. #62811

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
buyaa-n merged 2 commits into from
Dec 15, 2021
Merged

Make ControlFlowBuilder.Clear public. #62811

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
5fb0bf5
Make `ControlFlowBuilder.Clear` public.
teo-tsirpanis Dec 14, 2021
303bdaa
Test that exception handlers are cleared as well.
teo-tsirpanis Dec 14, 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
1 change: 1 addition & 0 deletions src/libraries/System.Reflection.Metadata/ref/System.Reflection.Metadata.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2533,6 +2533,7 @@ public void AddCatchRegion(System.Reflection.Metadata.Ecma335.LabelHandle trySta
public void AddFaultRegion(System.Reflection.Metadata.Ecma335.LabelHandle tryStart, System.Reflection.Metadata.Ecma335.LabelHandle tryEnd, System.Reflection.Metadata.Ecma335.LabelHandle handlerStart, System.Reflection.Metadata.Ecma335.LabelHandle handlerEnd) { }
public void AddFilterRegion(System.Reflection.Metadata.Ecma335.LabelHandle tryStart, System.Reflection.Metadata.Ecma335.LabelHandle tryEnd, System.Reflection.Metadata.Ecma335.LabelHandle handlerStart, System.Reflection.Metadata.Ecma335.LabelHandle handlerEnd, System.Reflection.Metadata.Ecma335.LabelHandle filterStart) { }
public void AddFinallyRegion(System.Reflection.Metadata.Ecma335.LabelHandle tryStart, System.Reflection.Metadata.Ecma335.LabelHandle tryEnd, System.Reflection.Metadata.Ecma335.LabelHandle handlerStart, System.Reflection.Metadata.Ecma335.LabelHandle handlerEnd) { }
public void Clear() { }
}
public readonly partial struct CustomAttributeArrayTypeEncoder
{
Expand Down
5 changes: 4 additions & 1 deletion ...Reflection.Metadata/src/System/Reflection/Metadata/Ecma335/Encoding/ControlFlowBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,10 @@ public ControlFlowBuilder()
_labels = ImmutableArray.CreateBuilder<int>();
}

internal void Clear()
/// <summary>
/// Clears the object's internal state, allowing the same instance to be reused.
/// </summary>
public void Clear()
{
_branches.Clear();
_labels.Clear();
Expand Down
39 changes: 39 additions & 0 deletions ...ies/System.Reflection.Metadata/tests/Metadata/Ecma335/Encoding/ControlFlowBuilderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,5 +418,44 @@ public void Branch_LongInstruction_LongDistance()
(byte)ILOpCode.Ret
}, builder.ToArray());
}

[Fact]
public void Clear()
{
var cfb = new ControlFlowBuilder();

var il1 = GenerateSampleIL(cfb);
cfb.Clear();
var il2 = GenerateSampleIL(cfb);

AssertEx.Equal(il1, il2);

static byte[] GenerateSampleIL(ControlFlowBuilder cfb)
{
var code = new BlobBuilder();
var il = new InstructionEncoder(code, cfb);

var l1 = il.DefineLabel();
var l2 = il.DefineLabel();
var l3 = il.DefineLabel();
var l4 = il.DefineLabel();

il.MarkLabel(l1);
il.OpCode(ILOpCode.Nop);
il.Branch(ILOpCode.Br_s, l1);
il.MarkLabel(l2);
il.OpCode(ILOpCode.Nop);
il.MarkLabel(l3);
il.OpCode(ILOpCode.Nop);
il.MarkLabel(l4);

cfb.AddCatchRegion(l1, l2, l3, l4, MetadataTokens.TypeDefinitionHandle(1));

var builder = new BlobBuilder();
new MethodBodyStreamEncoder(builder).AddMethodBody(il);

return builder.ToArray();
}
}
}
}