inlining as before, though broken

Author: dcodeIO

src/compiler.ts

@@ -6768,6 +6768,8 @@ export class Compiler extends DiagnosticEmitter {
     );
     ctorInstance.set(CommonFlags.INSTANCE | CommonFlags.CONSTRUCTOR | CommonFlags.COMPILED);
     classInstance.constructorInstance = ctorInstance;
+    var previousFunction = this.currentFunction;
+    this.currentFunction = ctorInstance;
 
     // generate body
     var module = this.module;
@@ -6799,6 +6801,7 @@ export class Compiler extends DiagnosticEmitter {
       for (let i = 0; i < numParameters; ++i) {
         operands[i + 1] = module.createGetLocal(i + 1, parameterTypes[i].toNativeType());
       }
+      // TODO: base constructor might be inlined, but makeCallDirect can't do this
       stmts.push(
         module.createSetLocal(0,
           this.makeCallDirect(assert(baseClass.constructorInstance), operands)
@@ -6818,16 +6821,19 @@ export class Compiler extends DiagnosticEmitter {
         : module.createBlock(null, stmts, nativeSizeType)
     );
     ctorInstance.finalize(module, funcRef);
+    this.currentFunction = previousFunction;
     return ctorInstance;
   }
 
   compileInstantiate(classInstance: Class, argumentExpressions: Expression[], reportNode: Node): ExpressionRef {
+    var ctor = this.ensureConstructor(classInstance, reportNode);
     var expr = this.compileCallDirect(
-      this.ensureConstructor(classInstance, reportNode),
+      ctor,
       argumentExpressions,
       reportNode,
-      this.options.usizeType.toNativeZero(this.module)
-      // TODO: inlining
+      this.options.usizeType.toNativeZero(this.module),
+      ctor.hasDecorator(DecoratorFlags.INLINE)
+      // FIXME: trying to inline a constructor that doesn't return a custom value doesn't work
     );
     this.currentType = classInstance.type;
     return expr;
@@ -7809,6 +7815,10 @@ export class Compiler extends DiagnosticEmitter {
 
   /** Makes the initializers for a class's fields. */
   makeFieldInitialization(classInstance: Class, stmts: ExpressionRef[] = []): ExpressionRef[] {
+
+    // must not be used in an inline context as it makes assumptions about local indexes
+    assert(!this.currentFunction.flow.is(FlowFlags.INLINE_CONTEXT));
+
     if (classInstance.members) {
       let module = this.module;
       let nativeSizeType = this.options.nativeSizeType;
@@ -7833,6 +7843,8 @@ export class Compiler extends DiagnosticEmitter {
               field.memoryOffset
             ));
           } else {
+            // NOTE: if all fields have initializers then this way is best, but if they don't,
+            // it would be more efficient to categorically zero memory on allocation.
             let parameterIndex = (<FieldDeclaration>field.prototype.declaration).parameterIndex;
             stmts.push(module.createStore(fieldType.byteSize,
               module.createGetLocal(0, nativeSizeType),

tests/compiler/std/pointer.untouched.wat

@@ -1760,13 +1760,21 @@
   (local $0 i32)
   (local $1 i32)
   (local $2 f32)
-  i32.const 0
-  i32.const 8
-  call $std/pointer/Pointer<Entry>#constructor
+  block $std/pointer/Pointer<Entry>#constructor|inlined.0 (result i32)
+   i32.const 0
+   set_local $0
+   i32.const 8
+   set_local $1
+   get_local $1
+  end
   set_global $std/pointer/one
-  i32.const 0
-  i32.const 24
-  call $std/pointer/Pointer<Entry>#constructor
+  block $std/pointer/Pointer<Entry>#constructor|inlined.1 (result i32)
+   i32.const 0
+   set_local $1
+   i32.const 24
+   set_local $0
+   get_local $0
+  end
   set_global $std/pointer/two
   block $std/pointer/Pointer<Entry>#get:offset|inlined.0 (result i32)
    get_global $std/pointer/one
@@ -2108,9 +2116,13 @@
    call $~lib/env/abort
    unreachable
   end
-  i32.const 0
-  i32.const 0
-  call $std/pointer/Pointer<f32>#constructor
+  block $std/pointer/Pointer<f32>#constructor|inlined.0 (result i32)
+   i32.const 0
+   set_local $0
+   i32.const 0
+   set_local $1
+   get_local $1
+  end
   set_global $std/pointer/buf
   get_global $std/pointer/buf
   i32.const 0
@@ -2150,11 +2162,11 @@
   end
   block $std/pointer/Pointer<f32>#get|inlined.0 (result f32)
    get_global $std/pointer/buf
-   set_local $0
-   i32.const 0
    set_local $1
-   get_local $0
+   i32.const 0
+   set_local $0
    get_local $1
+   get_local $0
    i32.const 4
    i32.mul
    i32.add
@@ -2173,11 +2185,11 @@
   end
   block $std/pointer/Pointer<f32>#get|inlined.1 (result f32)
    get_global $std/pointer/buf
-   set_local $1
-   i32.const 1
    set_local $0
-   get_local $1
+   i32.const 1
+   set_local $1
    get_local $0
+   get_local $1
    i32.const 4
    i32.mul
    i32.add
@@ -2222,13 +2234,13 @@
   end
   block
    get_global $std/pointer/buf
-   set_local $0
-   i32.const 2
    set_local $1
+   i32.const 2
+   set_local $0
    f32.const 1.2999999523162842
    set_local $2
-   get_local $0
    get_local $1
+   get_local $0
    i32.const 4
    i32.mul
    i32.add
@@ -2251,11 +2263,11 @@
   end
   block $std/pointer/Pointer<f32>#get|inlined.2 (result f32)
    get_global $std/pointer/buf
-   set_local $1
-   i32.const 2
    set_local $0
-   get_local $1
+   i32.const 2
+   set_local $1
    get_local $0
+   get_local $1
    i32.const 4
    i32.mul
    i32.add
@@ -2290,8 +2302,8 @@
   call $std/pointer/Pointer<f32>#set:value
   block $std/pointer/Pointer<f32>#get:value|inlined.0 (result f32)
    get_global $std/pointer/buf
-   set_local $0
-   get_local $0
+   set_local $1
+   get_local $1
    f32.load
    br $std/pointer/Pointer<f32>#get:value|inlined.0
   end