Don't reset nested unchecked contexts, fixes #515

dcodeIO · dcodeIO · commit 2945af655795 · 2019-02-27T17:10:20.000+01:00
diff --git a/src/builtins.ts b/src/builtins.ts
@@ -2936,9 +2936,10 @@ export function compileCall(
         return module.createUnreachable();
       }
       let flow = compiler.currentFlow;
+      let alreadyUnchecked = flow.is(FlowFlags.UNCHECKED_CONTEXT);
       flow.set(FlowFlags.UNCHECKED_CONTEXT);
       ret = compiler.compileExpressionRetainType(operands[0], contextualType, WrapMode.NONE);
-      flow.unset(FlowFlags.UNCHECKED_CONTEXT);
+      if (!alreadyUnchecked) flow.unset(FlowFlags.UNCHECKED_CONTEXT);
       return ret;
     }
     case BuiltinSymbols.call_indirect: { // call_indirect<T?>(target: Function | u32, ...args: *[]) -> T

Original file line number	Diff line number	Diff line change
`@@ -2936,9 +2936,10 @@ export function compileCall(`
`2936`	`2936`	`return module.createUnreachable();`
`2937`	`2937`	`}`
`2938`	`2938`	`let flow = compiler.currentFlow;`
	`2939`	`+ let alreadyUnchecked = flow.is(FlowFlags.UNCHECKED_CONTEXT);`
`2939`	`2940`	`flow.set(FlowFlags.UNCHECKED_CONTEXT);`
`2940`	`2941`	`ret = compiler.compileExpressionRetainType(operands[0], contextualType, WrapMode.NONE);`
`2941`		`- flow.unset(FlowFlags.UNCHECKED_CONTEXT);`
	`2942`	`+ if (!alreadyUnchecked) flow.unset(FlowFlags.UNCHECKED_CONTEXT);`
`2942`	`2943`	`return ret;`
`2943`	`2944`	`}`
`2944`	`2945`	`case BuiltinSymbols.call_indirect: { // call_indirect<T?>(target: Function \| u32, ...args: *[]) -> T`