Skip to content

Commit 1e1285e

Browse files
committed
Address comments from @grendello
1 parent 32e7f55 commit 1e1285e

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

src/Java.Interop.Export/Java.Interop/MarshalMemberBuilder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ public LambdaExpression CreateMarshalToManagedExpression (MethodInfo method, Jav
278278
typeof (object),
279279
typeof (IntPtr)
280280
};
281-
marshalDelegateTypes = new ();
281+
marshalDelegateTypes = new (StringComparer.Ordinal);
282282
}
283283
if (marshalDelegateTypes!.TryGetValue (name, out var type)) {
284284
return type;

src/Java.Interop.Tools.Expressions/Java.Interop.Tools.Expressions/CecilCompilerExpressionVisitor.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,7 @@ protected override Expression VisitInvocation (
295295

296296
List<Instruction> GetFixupsForLabelTarget (LabelTarget target)
297297
{
298-
List<Instruction>? fixups;
299-
if (!returnFixups.TryGetValue (target, out fixups)) {
298+
if (!returnFixups.TryGetValue (target, out List<Instruction>? fixups)) {
300299
returnFixups.Add (target, fixups = new ());
301300
}
302301
return fixups;
@@ -313,7 +312,7 @@ protected override Expression VisitLabel (
313312
{
314313
Logger (TraceLevel.Verbose, $"# jonp: CecilCompilerExpressionVisitor.VisitLabel: {node}");
315314
var target = il.Body.Instructions.Last ();
316-
if (returnFixups.TryGetValue (node.Target, out var fixups)) {
315+
if (returnFixups.TryGetValue (node.Target, out List<Instruction>? fixups)) {
317316
foreach (var replace in fixups) {
318317
Logger (TraceLevel.Verbose, $"# jonp: VisitLabel: replacing instruction `{replace}` w/ `leave {target}");
319318
Debug.Assert (replace.OpCode == OpCodes.Ret || replace.OpCode == OpCodes.Nop);

src/Java.Interop.Tools.Expressions/Java.Interop.Tools.Expressions/ExpressionAssemblyBuilder.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ void FillVariables (
367367
var variableVisitor = new VariableExpressionVisitor (variables.Keys, Logger);
368368
variableVisitor.Visit (e);
369369

370-
Console.WriteLine ($"# jonp: filling {variableVisitor.Variables.Count} variables");
370+
Logger (TraceLevel.Verbose, $"# jonp: filling {variableVisitor.Variables.Count} variables");
371371
for (int i = 0; i < variableVisitor.Variables.Count; ++i) {
372372
var c = variableVisitor.Variables [i];
373373
var d = new VariableDefinition (declaringAssembly.MainModule.ImportReference (c.Type));
@@ -397,7 +397,7 @@ void FillVariables (
397397
if (c == variableVisitor.ReturnValue) {
398398
ReturnValue = v;
399399
}
400-
Console.WriteLine ($"# jonp: FillVariables: local var {c.Name} is index {i}");
400+
Logger (TraceLevel.Verbose, $"# jonp: FillVariables: local var {c.Name} is index {i}");
401401
}
402402
}
403403
}

0 commit comments

Comments
 (0)