X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.scl.compiler%2Fsrc%2Forg%2Fsimantics%2Fscl%2Fcompiler%2Felaboration%2Fexpressions%2FEIf.java;h=149c52f500235d5f732aa4a12f744b3d75851bc7;hp=fe6216fe153c3bb8fec3da0e83c86940aa8a9269;hb=91682baa9a8252390f09b80fd724f47e5957b234;hpb=3826e289058a51d09310b7ba1251e959dc0ed3d0 diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EIf.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EIf.java index fe6216fe1..149c52f50 100644 --- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EIf.java +++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EIf.java @@ -47,16 +47,16 @@ public class EIf extends Expression { CodeWriter thenBlock = w.createBlock(); if(else_ != null) { CodeWriter elseBlock = w.createBlock(); - w.if_(conditionVal, thenBlock.getContinuation(), elseBlock.getContinuation()); + w.if_(location, conditionVal, thenBlock.getContinuation(), elseBlock.getContinuation()); IVal elseVal = else_.toVal(context, elseBlock); - elseBlock.jump(joinPoint.getContinuation(), elseVal); + elseBlock.jump(location, joinPoint.getContinuation(), elseVal); } else { - w.if_(conditionVal, thenBlock.getContinuation(), joinPoint.getContinuation()); + w.if_(location, conditionVal, thenBlock.getContinuation(), joinPoint.getContinuation()); } IVal thenVal = then_.toVal(context, thenBlock); - thenBlock.jump(joinPoint.getContinuation(), thenVal); + thenBlock.jump(location, joinPoint.getContinuation(), thenVal); w.continueAs(joinPoint); return w.getParameters()[0];