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%2Finternal%2Fcodegen%2Fssa%2Fstatements%2FLetApply.java;h=d3f22196b4058abe550f7060df723bbce4ff5f19;hp=8d5d24e3c421ea37a77406153286fafc1f8cdbfb;hb=cb5fc8d606d8b322563e9345c441eecfa7f01753;hpb=969bd23cab98a79ca9101af33334000879fb60c5

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/codegen/ssa/statements/LetApply.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/codegen/ssa/statements/LetApply.java
index 8d5d24e3c..d3f22196b 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/codegen/ssa/statements/LetApply.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/codegen/ssa/statements/LetApply.java
@@ -5,6 +5,7 @@ import java.util.Arrays;
 
 import org.simantics.scl.compiler.common.exceptions.InternalCompilerError;
 import org.simantics.scl.compiler.constants.Constant;
+import org.simantics.scl.compiler.constants.SCLConstant;
 import org.simantics.scl.compiler.internal.codegen.continuations.ContRef;
 import org.simantics.scl.compiler.internal.codegen.references.BoundVar;
 import org.simantics.scl.compiler.internal.codegen.references.Val;
@@ -22,13 +23,13 @@ import org.simantics.scl.compiler.internal.codegen.utils.MethodBuilder;
 import org.simantics.scl.compiler.internal.codegen.utils.PrintingContext;
 import org.simantics.scl.compiler.internal.codegen.utils.SSASimplificationContext;
 import org.simantics.scl.compiler.internal.codegen.utils.SSAValidationContext;
+import org.simantics.scl.compiler.internal.codegen.utils.ValRefVisitor;
 import org.simantics.scl.compiler.top.SCLCompilerConfiguration;
 import org.simantics.scl.compiler.types.TVar;
 import org.simantics.scl.compiler.types.Type;
 import org.simantics.scl.compiler.types.Types;
 import org.simantics.scl.compiler.types.exceptions.MatchException;
 import org.simantics.scl.compiler.types.util.MultiFunction;
-import org.simantics.scl.compiler.types.util.TypeUnparsingContext;
 
 public class LetApply extends LetStatement implements ValRefBinder {
     private ValRef function;
@@ -158,6 +159,26 @@ public class LetApply extends LetStatement implements ValRefBinder {
             context.markModified("LetApply.dead-let-statement");
             return;
         }
+        // TODO this is quite heavy way for inlining constants
+        for(int i=0;i<parameters.length;++i) {
+            ValRef parameter = parameters[i];
+            Val value = parameter.getBinding();
+            if(!(value instanceof SCLConstant))
+                continue;
+            SCLConstant constant = (SCLConstant)value;
+            if(constant.inlineArity != 0)
+                continue;
+            SSAFunction definition = constant.definition;
+            SSABlock block = definition.getFirstBlock();
+            if(block.getFirstStatement() != null || !(block.getExit() instanceof Jump))
+                continue;
+            Jump jump = (Jump)block.getExit();
+            if(jump.getTarget().getBinding() != definition.getReturnCont())
+                continue;
+            if(jump.getParameter(0).getTypeParameters().length > 0)
+                continue;
+            parameter.replaceBy(jump.getParameter(0).getBinding());
+        }
         Val functionVal = getFunction().getBinding();
         if(functionVal instanceof BoundVar) {
             BoundVarBinder parent_ = ((BoundVar)functionVal).parent;
@@ -460,4 +481,11 @@ public class LetApply extends LetStatement implements ValRefBinder {
     public void prepare(MethodBuilder mb) {
         function.getBinding().prepare(mb);
     }
+
+    @Override
+    public void forValRefs(ValRefVisitor visitor) {
+        visitor.visit(function);
+        for(ValRef parameter : parameters)
+            visitor.visit(parameter);
+    }
 }