Fix inline assignment declaration codegen

src/main/java/com/aparapi/internal/writer/BlockWriter.java

@@ -304,6 +304,52 @@ public void writeSequence(Instruction _first, Instruction _last) throws CodeGenE
 
    }
 
+   private void collectInlineAssignDeclarations(Instruction _instruction, Map<String, LocalVariableInfo> _declarations)
+         throws CodeGenException {
+      if (_instruction == null) {
+         return;
+      }
+
+      if (_instruction instanceof CompositeInstruction) {
+         return;
+      }
+
+      if (_instruction.getByteCode().equals(ByteCode.INLINE_ASSIGN)) {
+         final InlineAssignInstruction inlineAssignInstruction = (InlineAssignInstruction) _instruction;
+         final AssignToLocalVariable assignToLocalVariable = inlineAssignInstruction.getAssignToLocalVariable();
+         final LocalVariableInfo localVariableInfo = assignToLocalVariable.getLocalVariableInfo();
+         if (assignToLocalVariable.isDeclaration()) {
+            if (localVariableInfo == null) {
+               throw new CodeGenException("outOfScope" + _instruction.getThisPC() + " = ");
+            }
+            _declarations.put(localVariableInfo.getVariableIndex() + ":" + localVariableInfo.getVariableName(),
+                  localVariableInfo);
+         }
+      }
+
+      for (Instruction operand = _instruction.getFirstChild(); operand != null; operand = operand.getNextExpr()) {
+         collectInlineAssignDeclarations(operand, _declarations);
+      }
+   }
+
+   private void writeInlineAssignDeclarations(Instruction _first, Instruction _last) throws CodeGenException {
+      final Map<String, LocalVariableInfo> declarations = new LinkedHashMap<String, LocalVariableInfo>();
+      for (Instruction instruction = _first; instruction != _last; instruction = instruction.getNextExpr()) {
+         collectInlineAssignDeclarations(instruction, declarations);
+      }
+
+      for (LocalVariableInfo localVariableInfo : declarations.values()) {
+         newLine();
+         final String descriptor = localVariableInfo.getVariableDescriptor();
+         if (descriptor.startsWith("[")) {
+            write(" __global ");
+         }
+         write(convertType(descriptor, true, false));
+         write(localVariableInfo.getVariableName());
+         write(";");
+      }
+   }
+
    protected void writeGetterBlock(FieldEntry accessorVariableFieldEntry) {
       write("{");
       in();
@@ -320,6 +366,7 @@ protected void writeGetterBlock(FieldEntry accessorVariableFieldEntry) {
    public void writeBlock(Instruction _first, Instruction _last) throws CodeGenException {
       write("{");
       in();
+      writeInlineAssignDeclarations(_first, _last);
       writeSequence(_first, _last);
       out();
       newLine();
@@ -698,10 +745,8 @@ public void writeInstruction(Instruction _instruction) throws CodeGenException {
          final AssignToLocalVariable assignToLocalVariable = inlineAssignInstruction.getAssignToLocalVariable();
 
          final LocalVariableInfo localVariableInfo = assignToLocalVariable.getLocalVariableInfo();
-         if (assignToLocalVariable.isDeclaration()) {
-            // this is bad! we need a general way to hoist up a required declaration
-            throw new CodeGenException("/* we can't declare this " + convertType(localVariableInfo.getVariableDescriptor(), true, false)
-                  + " here */");
+         if (localVariableInfo == null) {
+            throw new CodeGenException("outOfScope" + _instruction.getThisPC() + " = ");
          }
          write(localVariableInfo.getVariableName());
          write("=");

src/test/java/com/aparapi/codegen/test/AssignAndPassAsParameterSimple.java

@@ -26,4 +26,28 @@ public void run() {
         actuallyDoIt(z = 1);
     }
 }
-/**{Throws{CodeGenException}Throws}**/
+/**{OpenCL{
+ typedef struct This_s{
+
+ int passid;
+ }This;
+ int get_pass_id(This *this){
+ return this->passid;
+ }
+
+ void com_amd_aparapi_test_AssignAndPassAsParameterSimple__actuallyDoIt(This *this, int a){
+ return;
+ }
+ __kernel void run(
+ int passid
+ ){
+ This thisStruct;
+ This* this=&thisStruct;
+ this->passid = passid;
+ {
+ int z;
+ com_amd_aparapi_test_AssignAndPassAsParameterSimple__actuallyDoIt(this, z=1);
+ return;
+ }
+ }
+ }OpenCL}**/

src/test/java/com/aparapi/codegen/test/AssignAndPassAsParameterSimpleTest.java

@@ -15,15 +15,36 @@
  */
 package com.aparapi.codegen.test;
 
-import com.aparapi.internal.exception.ClassParseException;
-import com.aparapi.internal.exception.CodeGenException;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class AssignAndPassAsParameterSimpleTest extends com.aparapi.codegen.CodeGenJUnitBase {
 
-    private static final String[] expectedOpenCL = null;
-    private static final Class<? extends com.aparapi.internal.exception.AparapiException> expectedException = CodeGenException.class;
+    private static final String[] expectedOpenCL = {
+        "typedef struct This_s{\n" +
+        "\n" +
+        " int passid;\n" +
+        " }This;\n" +
+        " int get_pass_id(This *this){\n" +
+        " return this->passid;\n" +
+        " }\n" +
+        "\n" +
+        " void com_aparapi_codegen_test_AssignAndPassAsParameterSimple__actuallyDoIt(This *this, int a){\n" +
+        " return;\n" +
+        " }\n" +
+        " __kernel void run(\n" +
+        " int passid\n" +
+        " ){\n" +
+        " This thisStruct;\n" +
+        " This* this=&thisStruct;\n" +
+        " this->passid = passid;\n" +
+        " {\n" +
+        " int z;\n" +
+        " com_aparapi_codegen_test_AssignAndPassAsParameterSimple__actuallyDoIt(this, z=1);\n" +
+        " return;\n" +
+        " }\n" +
+        " }\n" +
+        " "};
+    private static final Class<? extends com.aparapi.internal.exception.AparapiException> expectedException = null;
 
     @Test
     public void AssignAndPassAsParameterSimpleTest() {