Merge make functions into getters.

[jlaanstra]

Results in small size gain.

[Sergio0694]

Have you measured any size change with NAOT?
Can you include a screenshot with before/after with sizoscope?

[jlaanstra]

Have you measured any size change with NAOT? Can you include a screenshot with before/after with sizoscope?

I haven't tested with any NativeAOT scenario.

[Sergio0694]

Mmh actually looking at updated projections I see this:

private static IObjectReference _objRef_global__Microsoft_Graphics_Canvas_CanvasDevice
{
  get
  {
    IObjectReference canvasCanvasDevice = CanvasDevice.___objRef_global__Microsoft_Graphics_Canvas_CanvasDevice;
    return canvasCanvasDevice != null && canvasCanvasDevice.IsInCurrentContext ? canvasCanvasDevice : (CanvasDevice.___objRef_global__Microsoft_Graphics_Canvas_CanvasDevice = ActivationFactory.Get("Microsoft.Graphics.Canvas.CanvasDevice"));
  }
}

public CanvasDevice()
  : this((IObjectReference) IActivationFactoryMethods.ActivateInstance<IUnknownVftbl>(CanvasDevice._objRef_global__Microsoft_Graphics_Canvas_CanvasDevice))
{
  ComWrappersSupport.RegisterObjectForInterface((object) this, this.ThisPtr);
  ComWrappersHelper.Init(this._inner, false);
}

Can you explain that canvasCanvasDevice != null && canvasCanvasDevice.IsInCurrentContext ? canvasCanvasDevice : (CanvasDevice.___objRef_global__Microsoft_Graphics_Canvas_CanvasDevice = ActivationFactory.Get("Microsoft.Graphics.Canvas.CanvasDevice")); bit? Isn't that just going to always throw the activation factory away every single time and just overwrite it with a new one if someone frequently creates new instances from different threads? Am I missing something here about how that works?

[jlaanstra]

Mmh actually looking at updated projections I see this:

private static IObjectReference _objRef_global__Microsoft_Graphics_Canvas_CanvasDevice
{
  get
  {
    IObjectReference canvasCanvasDevice = CanvasDevice.___objRef_global__Microsoft_Graphics_Canvas_CanvasDevice;
    return canvasCanvasDevice != null && canvasCanvasDevice.IsInCurrentContext ? canvasCanvasDevice : (CanvasDevice.___objRef_global__Microsoft_Graphics_Canvas_CanvasDevice = ActivationFactory.Get("Microsoft.Graphics.Canvas.CanvasDevice"));
  }
}

public CanvasDevice()
  : this((IObjectReference) IActivationFactoryMethods.ActivateInstance<IUnknownVftbl>(CanvasDevice._objRef_global__Microsoft_Graphics_Canvas_CanvasDevice))
{
  ComWrappersSupport.RegisterObjectForInterface((object) this, this.ThisPtr);
  ComWrappersHelper.Init(this._inner, false);
}

Can you explain that canvasCanvasDevice != null && canvasCanvasDevice.IsInCurrentContext ? canvasCanvasDevice : (CanvasDevice.___objRef_global__Microsoft_Graphics_Canvas_CanvasDevice = ActivationFactory.Get("Microsoft.Graphics.Canvas.CanvasDevice")); bit? Isn't that just going to always throw the activation factory away every single time and just overwrite it with a new one if someone frequently creates new instances from different threads? Am I missing something here about how that works?

That is exactly what it does. We only cache one factory and if the cached version requires a different apartment, we create a new one and cache that. For free-threaded factories we cache the first one forever (IsInCurrentContext will always be true).