Added support for stack allocation. Check for NULL before calling memory checker.

[repair.git] / Repair / RepairCompiler / MCC / IR / DotExpr.java

diff --git a/Repair/RepairCompiler/MCC/IR/DotExpr.java b/Repair/RepairCompiler/MCC/IR/DotExpr.java
index 7924bb47008b4f422a9b630797f58e2fbd8e5655..38ee61a1929fade919f4d097dc5bbc61f0a683db 100755 (executable)
--- a/Repair/RepairCompiler/MCC/IR/DotExpr.java
+++ b/Repair/RepairCompiler/MCC/IR/DotExpr.java
@@ -168,16 +168,18 @@ public class DotExpr extends Expr {
                 /* type var = [*(int *)] (base + offset) */
                 writer.outputline("int " + dest.getSafeSymbol()+"=0;");
                writer.outputline("if ("+leftd.getSafeSymbol()+")");
+               writer.startblock();
                 writer.outputline(dest.getSafeSymbol() + 
                                   " = " + ptr + "(" + leftd.getSafeSymbol() + " + " + offset + ");");  
-               writer.outputline("else maybe=1;");
                if (fd.getPtr()) {
+                   writer.outputline("if ("+dest.getSafeSymbol()+")");
+                   writer.startblock();
                    VarDescriptor typevar=VarDescriptor.makeNew("typechecks");
                    if (DOMEMCHECKS&&(!DOTYPECHECKS)) {
-                       writer.outputline("bool "+typevar.getSafeSymbol()+"=assertvalidmemory(" + dest.getSafeSymbol() + ", " + td.getId() + ");");
+                       writer.outputline("bool "+typevar.getSafeSymbol()+"=assertvalidmemory(" + dest.getSafeSymbol() + ", " + this.td.getId() + ");");
                        dotypecheck = true;
                    } else if (DOTYPECHECKS) {
-                       writer.outputline("bool "+typevar.getSafeSymbol()+"=assertvalidtype(" + dest.getSafeSymbol() + ", " + td.getId() + ");");
+                       writer.outputline("bool "+typevar.getSafeSymbol()+"=assertvalidtype(" + dest.getSafeSymbol() + ", " + this.td.getId() + ");");
                    }
                    writer.outputline("if (!"+typevar.getSafeSymbol()+")");
                    writer.startblock();
@@ -185,7 +187,10 @@ public class DotExpr extends Expr {
                    if (DONULL)
                        writer.outputline(ptr + "(" + leftd.getSafeSymbol() + " + " + offset + ")=0;");
                    writer.endblock();
+                   writer.endblock();
                }
+               writer.endblock();
+               writer.outputline("else maybe=1;");
             }
         } else { /* offset in bits is an expression that must be generated */                        
             VarDescriptor ob = VarDescriptor.makeNew("offsetinbits");
@@ -220,16 +225,18 @@ public class DotExpr extends Expr {
                 /* type var = [*(int *)] (base + offset) */
                 writer.outputline("int " + dest.getSafeSymbol() +"=0;"); 
                writer.outputline("if ("+leftd.getSafeSymbol()+")");
+               writer.startblock();
                 writer.outputline(dest.getSafeSymbol() + 
                                   " = " + ptr + "(" + leftd.getSafeSymbol() + " + " + offset.getSafeSymbol() + ");");  
-               writer.outputline("else maybe=1;");
                if (fd.getPtr()) {
+                   writer.outputline("if ("+dest.getSafeSymbol()+")");
+                   writer.startblock();
                    VarDescriptor typevar=VarDescriptor.makeNew("typechecks");
                    if (DOMEMCHECKS&&(!DOTYPECHECKS)) {
-                       writer.outputline("bool "+typevar.getSafeSymbol()+"=assertvalidmemory(" + dest.getSafeSymbol() + ", " + td.getId() + ");");
+                       writer.outputline("bool "+typevar.getSafeSymbol()+"=assertvalidmemory(" + dest.getSafeSymbol() + ", " + this.td.getId() + ");");
                        dotypecheck = true;
                    } else if (DOTYPECHECKS) {
-                       writer.outputline("bool "+typevar.getSafeSymbol()+"=assertvalidtype(" + dest.getSafeSymbol() + ", " + td.getId() + ");");
+                       writer.outputline("bool "+typevar.getSafeSymbol()+"=assertvalidtype(" + dest.getSafeSymbol() + ", " + this.td.getId() + ");");
                    }
                    writer.outputline("if (!"+typevar.getSafeSymbol()+")");
                    writer.startblock();
@@ -237,7 +244,10 @@ public class DotExpr extends Expr {
                    if (DONULL)
                        writer.outputline(ptr + "(" + leftd.getSafeSymbol() + " + " + offset.getSafeSymbol() + ")=0;");
                    writer.endblock();
+                   writer.endblock();
                }
+               writer.endblock();
+               writer.outputline("else maybe=1;");
             }
         }
     }