Fix OpenCL reserved keyword local variable generation

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

@@ -80,8 +80,22 @@ public abstract class BlockWriter{
 
    public final static String arrayDimMangleSuffix = "__javaArrayDimension";
 
+   private static final Set<String> openCLReservedWords = new HashSet<String>(Arrays.asList(
+         "__kernel", "kernel", "__global", "global", "__local", "local", "__constant", "constant", "__private",
+         "private", "read_only", "write_only", "read_write", "image2d_t", "image3d_t", "sampler_t", "event_t",
+         "bool", "char", "uchar", "short", "ushort", "int", "uint", "long", "ulong", "float", "double", "half",
+         "void", "struct", "union", "enum", "typedef", "const", "volatile", "restrict", "unsigned", "signed", "if",
+         "else", "while", "do", "for", "switch", "case", "default", "break", "continue", "return", "goto", "sizeof"));
+
    public abstract void write(String _string);
 
+   public String escapeOpenCLIdentifier(String identifier) {
+      if (openCLReservedWords.contains(identifier)) {
+         return identifier + "$";
+      }
+      return identifier;
+   }
+
    public void writeln(String _string) {
       write(_string);
       newLine();
@@ -417,7 +431,7 @@ public void writeInstruction(Instruction _instruction) throws CodeGenException {
              } else {
                  final String descriptor = localVariableInfo.getVariableDescriptor();
                  write(convertType(descriptor, true, true));
-                 write(localVariableInfo.getVariableName());
+                 write(escapeOpenCLIdentifier(localVariableInfo.getVariableName()));
              }
          } else {
              if (assignToLocalVariable.isDeclaration()) {
@@ -431,7 +445,7 @@ public void writeInstruction(Instruction _instruction) throws CodeGenException {
              if (localVariableInfo == null) {
                  throw new CodeGenException("outOfScope" + _instruction.getThisPC() + " = ");
              } else {
-                 write(localVariableInfo.getVariableName() + " = ");
+                 write(escapeOpenCLIdentifier(localVariableInfo.getVariableName()) + " = ");
              }
          }
 
@@ -581,13 +595,13 @@ public void writeInstruction(Instruction _instruction) throws CodeGenException {
       } else if (_instruction instanceof AccessLocalVariable) {
          final AccessLocalVariable localVariableLoadInstruction = (AccessLocalVariable) _instruction;
          final LocalVariableInfo localVariable = localVariableLoadInstruction.getLocalVariableInfo();
-         write(localVariable.getVariableName());
+         write(escapeOpenCLIdentifier(localVariable.getVariableName()));
       } else if (_instruction instanceof I_IINC) {
          final I_IINC location = (I_IINC) _instruction;
          final LocalVariableInfo localVariable = location.getLocalVariableInfo();
          final int adjust = location.getAdjust();
 
-         write(localVariable.getVariableName());
+         write(escapeOpenCLIdentifier(localVariable.getVariableName()));
          if (adjust == 1) {
             write("++");
          } else if (adjust == -1) {
@@ -688,7 +702,7 @@ public void writeInstruction(Instruction _instruction) throws CodeGenException {
             if (localVariableInfo == null) {
                throw new CodeGenException("outOfScope" + _instruction.getThisPC() + " = ");
             } else {
-               write(localVariableInfo.getVariableName() + " = ");
+               write(escapeOpenCLIdentifier(localVariableInfo.getVariableName()) + " = ");
             }
 
          }
@@ -703,7 +717,7 @@ public void writeInstruction(Instruction _instruction) throws CodeGenException {
             throw new CodeGenException("/* we can't declare this " + convertType(localVariableInfo.getVariableDescriptor(), true, false)
                   + " here */");
          }
-         write(localVariableInfo.getVariableName());
+         write(escapeOpenCLIdentifier(localVariableInfo.getVariableName()));
          write("=");
          writeInstruction(inlineAssignInstruction.getRhs());
       } else if (_instruction.getByteCode().equals(ByteCode.FIELD_ARRAY_ELEMENT_ASSIGN)) {

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

@@ -687,7 +687,7 @@ public void writePragma(String _name, boolean _enable) {
                }
 
                write(convertType(descriptor, true, false));
-               write(lvi.getVariableName());
+               write(escapeOpenCLIdentifier(lvi.getVariableName()));
                alreadyHasFirstArg = true;
 
                localVariableIndex++;

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

@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) 2016 - 2018 Syncleus, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ */
+package com.aparapi.codegen.test;
+
+public class OpenCLReservedLocalVariable {
+
+    public void run() {
+        int kernel = 1;
+        int global = kernel + 1;
+        kernel = global;
+    }
+}

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

@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) 2016 - 2018 Syncleus, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ */
+package com.aparapi.codegen.test;
+
+import org.junit.Test;
+
+public class OpenCLReservedLocalVariableTest extends com.aparapi.codegen.CodeGenJUnitBase {
+
+    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"
+        + " __kernel void run(\n"
+        + " int passid\n"
+        + " ){\n"
+        + " This thisStruct;\n"
+        + " This* this=&thisStruct;\n"
+        + " this->passid = passid;\n"
+        + " {\n"
+        + " int kernel$ = 1;\n"
+        + " int global$ = kernel$ + 1;\n"
+        + " kernel$ = global$;\n"
+        + " return;\n"
+        + " }\n"
+        + " }\n"
+        + " "};
+    private static final Class<? extends com.aparapi.internal.exception.AparapiException> expectedException = null;
+
+    @Test
+    public void OpenCLReservedLocalVariableTest() {
+        test(com.aparapi.codegen.test.OpenCLReservedLocalVariable.class, expectedException, expectedOpenCL);
+    }
+}