Fixed internal bug that occured when dumping bounds-check annotations involving struc...

diff --git a/src/constraintExpr.c b/src/constraintExpr.c
index 62d8f03aeb9753d858b36d26d7475577d3a8059a..c40a31f2848d4d3b2144e29445d82576068ad77e 100644 (file)
--- a/src/constraintExpr.c
+++ b/src/constraintExpr.c
@@ -2139,6 +2139,10 @@ void  constraintExpr_dump (/*@observer@*/ constraintExpr expr,  FILE *f)
   constraintExprKind kind;
   constraintTerm t;
   
+
+  DPRINTF((message("constraintExpr_dump:: dumping constraintExpr %s",
+                  constraintExpr_unparse(expr)
+                  ) ));
   
   kind = expr->kind;
   

diff --git a/src/constraintTerm.c b/src/constraintTerm.c
index a309c9d6d0d119ce98113944339d4470f84180c7..868c9d551622252f1e82f7cac0020eefc82b9f06 100644 (file)
--- a/src/constraintTerm.c
+++ b/src/constraintTerm.c
@@ -581,6 +581,10 @@ void constraintTerm_dump ( /*@observer@*/ constraintTerm t,  FILE *f)
            fprintf(f, "Param %s %d\n", cstring_toCharsSafe(ctString), (int) param );
            cstring_free(ctString);
          }
+       else if (sRef_isField (s) )
+         {
+           fprintf(f, "sRef_dump %s\n", cstring_toCharsSafe(sRef_dump(s)) );
+         }
        else
          {
            u = sRef_getUentry(s);
@@ -651,6 +655,11 @@ void constraintTerm_dump ( /*@observer@*/ constraintTerm t,  FILE *f)
            s = sRef_makeParam (param, t, stateInfo_makeLoc (g_currentloc));
            free (ostr2);
          }
+       else if (strcmp (term, "sRef_dump" ) == 0 )
+         {
+           reader_checkChar(&str, ' ');
+           s = sRef_undump (&str);
+         }
        else  /* This must be an identified that we can search for in usymTab */
          {
            cstring termStr = cstring_makeLiteralTemp(term);