Add method inlining to inline constructors filter

src-json/meta.json

@@ -573,6 +573,12 @@
 		"doc": "Internally used to mark expressions that were passed as arguments of an inlined constructor.",
 		"internal": true
 	},
+	{
+		"name": "InlineObject",
+		"metadata": ":inlineObject",
+		"doc": "Internally used by inline constructors filter to mark potentially inlineable objects.",
+		"internal": true
+	},
 	{
 		"name": "Internal",
 		"metadata": ":internal",

tests/misc/projects/inline-constructors/Extern.hx

@@ -0,0 +1,11 @@
+class Inl {
+	public var i : Int = 0;
+	public extern inline function new() {}
+}
+
+class Extern {
+	public static function main() {
+		var a = new Inl();
+		trace(a);
+	}
+}

tests/misc/projects/inline-constructors/ForceInline.hx

@@ -0,0 +1,11 @@
+class Inl {
+	public var i : Int = 0;
+	public function new() {}
+}
+
+class ForceInline {
+	public static function main() {
+		var a = inline new Inl();
+		trace(a);
+	}
+}

tests/misc/projects/inline-constructors/compile-extern-fail.hxml

@@ -0,0 +1,2 @@
+Extern
+-js extern.js

tests/misc/projects/inline-constructors/compile-extern-fail.hxml.stderr

@@ -0,0 +1,2 @@
+Extern.hx:8: characters 11-20 : Forced inline constructor could not be inlined
+Extern.hx:9: characters 9-10 : Cancellation happened here

tests/misc/projects/inline-constructors/compile-force-inline-fail.hxml

@@ -0,0 +1,2 @@
+ForceInline
+-js force-inline.js

tests/misc/projects/inline-constructors/compile-force-inline-fail.hxml.stderr

@@ -0,0 +1,2 @@
+ForceInline.hx:8: characters 11-27 : Forced inline constructor could not be inlined
+ForceInline.hx:9: characters 9-10 : Cancellation happened here

tests/optimization/run.hxml

@@ -21,5 +21,6 @@
 --macro Macro.register('TestJs')
 --macro Macro.register('TestLocalDce')
 --macro Macro.register('TestTreGeneration')
+--macro Macro.register('TestInlineConstructors')
 --macro Macro.register('issues')
 --dce std

tests/optimization/src/TestInlineConstructors.hx

@@ -0,0 +1,100 @@
+class InlineClass {
+	public var a = 1;
+	public var b = "";
+	public var c = "hello";
+	public inline function new() {
+	}
+
+	public inline function method() {
+		return a + b + c;
+	}
+}
+
+class NestedInlineClass {
+	public var a : InlineClass;
+	public var b : Array<Int>;
+	public var c : {a: Int};
+
+	public inline function new() {
+		a = new InlineClass();
+		b = [1,2,3];
+		c = {a:4};
+	}
+}
+
+class TestInlineConstructors extends TestBase {
+	@:js('return [1,2,3,3];')
+	static function testArrayInlining() {
+		var a = [1,2,3];
+		return [a[0], a[1], a[2], a.length];
+	}
+
+	@:js('return [2,"hello","world"];')
+	static function testAnonymousStructureInlining() {
+		var a = {a: 1, b: "", c: "hello"};
+		a.a = 2;
+		a.b = a.c;
+		a.c = "world";
+		return ([a.a,a.b,a.c] : Array<Dynamic>);
+	}
+
+	@:js('return [2,"hello","world"];')
+	static function testClassConstructorInlining() {
+		var a = new InlineClass();
+		a.a = 2;
+		a.b = a.c;
+		a.c = "world";
+		return return ([a.a,a.b,a.c] : Array<Dynamic>);
+	}
+
+	@:js('return [1,2,4,"test",2,1,4,3,4];')
+	static function testNestedInlining() {
+		var a = {
+			a: new NestedInlineClass(),
+			b: [new NestedInlineClass()],
+			c: {test: new NestedInlineClass()}
+		};
+		a.b[0].a.c = "test";
+		return ([a.a.a.a, a.a.b[1], a.a.c.a, a.b[0].a.c, a.b[0].b[1], a.b.length, a.c.test.c.a, a.c.test.b[2], a.c.test.c.a]:Dynamic);
+	}
+
+	@:js('return [1,"hello","world"];')
+	static function testMultipleAliasingVariables() {
+		var a = new InlineClass();
+		var b = a;
+		var d = [b,a];
+		d[1].b = "hello";
+		a.c = "world";
+		return ([a.a, a.b, d[1].c]:Array<Dynamic>);
+	}
+
+	@:js('return [1,"","hello"];')
+	static function testUnassignedVariables() {
+		var a;
+		a = new InlineClass();
+		return ([a.a, a.b, a.c]:Array<Dynamic>);
+	}
+
+	@:js('return [1,3,"hello"];')
+	static function testNoExplicitVariables() {
+		return ([
+			new InlineClass().a,
+			[1,2,3][2],
+			new NestedInlineClass().a.c
+		]:Array<Dynamic>);
+	}
+
+	@:js('return 1 + "" + "hello";')
+	static function testMethodInlining() {
+		var a : {function method() : String;} = new InlineClass();
+		return a.method();
+	}
+
+	@:js('var b = new InlineClass();return [new InlineClass().method(1),b.method(2)];')
+	static function testIncompatibleMethodCancelling() {
+		// InlineClass.method doesn't take any arguments, the method should not be inlined.
+		var a : {function method(arg : Int) : String;} = cast new InlineClass();
+		var b : Dynamic = new InlineClass();
+		return [a.method(1), b.method(2)];
+	}
+}