Browse Source

Fix merge conflict

pull/9541/head
Max Katz 4 years ago
parent
commit
afa7c32028
  1. 12
      src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlConstructorServiceProviderTransformer.cs

12
src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/Transformers/AvaloniaXamlIlConstructorServiceProviderTransformer.cs

@ -41,18 +41,6 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers
public bool NeedsParentStack => true;
public XamlILNodeEmitResult Emit(XamlEmitContext<IXamlILEmitter, XamlILNodeEmitResult> context, IXamlILEmitter codeGen)
{
if (_inheritContext)
{
codeGen.Ldloc(context.ContextLocal);
}
else
{
codeGen.Ldloc(context.ContextLocal);
var method = context.GetAvaloniaTypes().RuntimeHelpers
.FindMethod(m => m.Name == "CreateRootServiceProviderV3");
codeGen.EmitCall(method);
}
codeGen.Ldloc(context.ContextLocal);
return XamlILNodeEmitResult.Type(0, Type.GetClrType());
}

Loading…
Cancel
Save