revert bits of a9806c0; the width of these pointers is done during the conversion phase

Author: Daniel Kroening

src/ansi-c/parser.y

@@ -3065,7 +3065,10 @@ unary_identifier_declarator:
         {
           // the type_qualifier_list is for the pointer,
           // and not the identifier_declarator
-          stack_type($1)=pointer_type(typet(ID_abstract));
+          // The below is deliberately not using pointer_type();
+          // the width is added during conversion.
+          stack_type($1).id(ID_pointer);
+          stack_type($1).subtype()=typet(ID_abstract);
           $2=merge($2, $1); // dest=$2
           make_subtype($3, $2); // dest=$3
           $$=$3;
@@ -3249,13 +3252,19 @@ unary_abstract_declarator:
           '*'
         {
           $$=$1;
-          stack_type($$)=pointer_type(typet(ID_abstract));
+          // The below is deliberately not using pointer_type();
+          // the width is added during conversion.
+          stack_type($$).id(ID_pointer);
+          stack_type($$).subtype()=typet(ID_abstract);
         }
         | '*' attribute_type_qualifier_list
         {
           // The type_qualifier_list belongs to the pointer,
           // not to the (missing) abstract declarator.
-          stack_type($1)=pointer_type(typet(ID_abstract));
+          // The below is deliberately not using pointer_type();
+          // the width is added during conversion.
+          stack_type($1).id(ID_pointer);
+          stack_type($1).subtype()=typet(ID_abstract);
           $$=merge($2, $1);
         }
         | '*' abstract_declarator
@@ -3267,7 +3276,10 @@ unary_abstract_declarator:
         {
           // The type_qualifier_list belongs to the pointer,
           // not to the abstract declarator.
-          stack_type($1)=pointer_type(typet(ID_abstract));
+          // The below is deliberately not using pointer_type();
+          // the width is added during conversion.
+          stack_type($1).id(ID_pointer);
+          stack_type($1).subtype()=typet(ID_abstract);
           $2=merge($2, $1); // dest=$2
           make_subtype($3, $2); // dest=$3
           $$=$3;
@@ -3286,13 +3298,19 @@ parameter_unary_abstract_declarator:
           '*'
         {
           $$=$1;
-          stack_type($$)=pointer_type(typet(ID_abstract));
+          // The below is deliberately not using pointer_type();
+          // the width is added during conversion.
+          stack_type($$).id(ID_pointer);
+          stack_type($$).subtype()=typet(ID_abstract);
         }
         | '*' attribute_type_qualifier_list
         {
           // The type_qualifier_list belongs to the pointer,
           // not to the (missing) abstract declarator.
-          stack_type($1)=pointer_type(typet(ID_abstract));
+          // The below is deliberately not using pointer_type();
+          // the width is added during conversion.
+          stack_type($1).id(ID_pointer);
+          stack_type($1).subtype()=typet(ID_abstract);
           $$=merge($2, $1);
         }
         | '*' parameter_abstract_declarator
@@ -3304,7 +3322,10 @@ parameter_unary_abstract_declarator:
         {
           // The type_qualifier_list belongs to the pointer,
           // not to the (missing) abstract declarator.
-          stack_type($1)=pointer_type(typet(ID_abstract));
+          // The below is deliberately not using pointer_type();
+          // the width is added during conversion.
+          stack_type($1).id(ID_pointer);
+          stack_type($1).subtype()=typet(ID_abstract);
           $2=merge($2, $1); // dest=$2
           make_subtype($3, $2); // dest=$3
           $$=$3;

src/ansi-c/parser_static.inc

@@ -290,7 +290,10 @@ Function: make_pointer
 
 static void make_pointer(const YYSTYPE dest)
 {
-  stack_type(dest)=pointer_type(typet(ID_abstract));
+  // The below deliberately avoids pointer_type().
+  // The width is set during conversion.
+  stack_type(dest).id(ID_pointer);
+  stack_type(dest).subtype()=typet(ID_abstract);
 }
 
 /*******************************************************************\

src/cpp/parse.cpp

@@ -18,7 +18,6 @@ Author: Daniel Kroening, [email protected]
 #include <util/std_code.h>
 #include <util/std_expr.h>
 #include <util/std_types.h>
-#include <util/c_types.h>
 
 #include <ansi-c/ansi_c_y.tab.h>
 
@@ -3016,7 +3015,7 @@ bool Parser::optPtrOperator(typet &ptrs)
 
     if(t=='*')
     {
-      typet op=pointer_type(typet(ID_nil));
+      typet op(ID_pointer); // width gets set during conversion
       cpp_tokent tk;
       lex.get_token(tk);
       set_location(op, tk);
@@ -3079,7 +3078,7 @@ bool Parser::optPtrOperator(typet &ptrs)
     {
       cpp_tokent tk;
       lex.get_token(tk);
-      typet op=pointer_type(typet(ID_nil));
+      typet op(ID_pointer); // width gets set during conversion
       op.set(ID_C_reference, true);
       set_location(op, tk);
       t_list.push_front(op);
@@ -3088,7 +3087,7 @@ bool Parser::optPtrOperator(typet &ptrs)
     {
       cpp_tokent tk;
       lex.get_token(tk);
-      typet op=pointer_type(typet(ID_nil));
+      typet op(ID_pointer); // width gets set during conversion
       op.set(ID_C_rvalue_reference, true);
       set_location(op, tk);
       t_list.push_front(op);
@@ -3531,7 +3530,7 @@ bool Parser::rPtrToMember(irept &ptr_to_mem)
   std::cout << std::string(__indent, ' ') << "Parser::rPtrToMember 0\n";
   #endif
 
-  typet ptm=pointer_type(typet(ID_nil));
+  typet ptm(ID_pointer); // width gets set during conversion
   irept &name = ptm.add("to-member");
   name=cpp_namet();
   irept::subt &components=name.get_sub();
@@ -6478,7 +6477,8 @@ bool Parser::rPrimaryExpr(exprt &exp)
 
   case TOK_NULLPTR:
     lex.get_token(tk);
-    exp=constant_exprt(ID_NULL, pointer_type(typet(ID_nullptr)));
+    // width of pointer gets done during conversion
+    exp=constant_exprt(ID_NULL, typet(ID_pointer, typet(ID_nullptr)));
     set_location(exp, tk);
     #ifdef DEBUG
     std::cout << std::string(__indent, ' ') << "Parser::rPrimaryExpr 6\n";