C/C++ front end fixes

Author: tautschnig

src/ansi-c/c_typecheck_expr.cpp

@@ -459,6 +459,11 @@ void c_typecheck_baset::typecheck_expr_main(exprt &expr)
           expr.id()==ID_gcc_asm_clobbered_register)
   {
   }
+  else if(expr.id()==ID_lshr || expr.id()==ID_ashr ||
+          expr.id()==ID_assign_lshr || expr.id()==ID_assign_ashr)
+  {
+    // already type checked
+  }
   else
   {
     err_location(expr);

src/ansi-c/gcc_builtin_headers_generic.h

@@ -86,7 +86,7 @@ void __sync_lock_release();
 // other
 int __builtin_choose_expr(_Bool, ...);
 int __builtin_classify_type();
-int __builtin_constant_p();
+int __builtin_constant_p(int);
 void __builtin_trap(void);
 void __builtin_unreachable(void);
 

src/cpp/cpp_typecheck_code.cpp

@@ -45,6 +45,10 @@ void cpp_typecheckt::typecheck_code(codet &code)
           statement==ID_msc_if_not_exists)
   {
   }
+  else if(statement==ID_decl_block)
+  {
+    // type checked already
+  }
   else
     c_typecheck_baset::typecheck_code(code);
 }

src/cpp/cpp_typecheck_type.cpp

@@ -7,6 +7,7 @@ Author: Daniel Kroening, kroening@cs.cmu.edu
 \*******************************************************************/
 
 #include <util/source_location.h>
+#include <util/simplify_expr.h>
 
 #include <ansi-c/c_qualifiers.h>
 
@@ -126,7 +127,10 @@ void cpp_typecheckt::typecheck_type(typet &type)
     exprt &size_expr=to_array_type(type).size();
 
     if(size_expr.is_not_nil())
+    {
       typecheck_expr(size_expr);
+      simplify(size_expr, *this);
+    }
 
     typecheck_type(type.subtype());