In Visual Studio, enums are always 'signed int'

Author: kroening

regression/ansi-c/enum3/main.c

@@ -1,8 +1,8 @@
-#ifdef __GNUC__
-
 #define STATIC_ASSERT(condition) \
   int some_array##__LINE__[(condition) ? 1 : -1]
 
+#if defined(__GNUC__)
+
 enum  { E1v1, E1v2 } __attribute__((packed)) e1;
 enum __attribute__((packed)) { E2v1=-1, E2v2 } e2;
 enum __attribute__((packed)) { E3v1=1000, E3v2 } e3;
@@ -35,11 +35,31 @@ int main()
   e5<<=1;
 }
 
-#else
+#elif defined(_MSC_VER)
+
+// In Visual Studio, everything is 'signed int'
+
+enum { E4v1=-1, E4v2 } e4;
+enum { E5v0=10, E5v1=0x100000000ll } e5;
+enum { E6 = E4v1 + 10 };
+enum { E7v1=0, E7v2=sizeof(E7v1), E7v3=0x100000000ll };
+
+STATIC_ASSERT(sizeof E4v1 == sizeof(int));
+STATIC_ASSERT(sizeof e4 == sizeof(int));
+STATIC_ASSERT(sizeof e5 == sizeof(int));
+STATIC_ASSERT(E5v1 == (int)0x100000000ll);
+STATIC_ASSERT(E6 == 9);
+STATIC_ASSERT(E7v2 == sizeof(int));
+STATIC_ASSERT(sizeof E7v3 == sizeof(int));
 
 int main()
 {
 }
 
+#else
+
+int main()
+{
+}
 #endif
 

src/ansi-c/c_typecheck_type.cpp

@@ -1033,25 +1033,32 @@ typet c_typecheck_baset::enum_constant_type(
   const mp_integer &min_value,
   const mp_integer &max_value) const
 {
-  // enum constants are at least 'int', but may be made larger.
-  // 'Packing' has no influence.
-  if(max_value<(mp_integer(1)<<(config.ansi_c.int_width-1)) &&
-     min_value>=-(mp_integer(1)<<(config.ansi_c.int_width-1)))
+  if(config.ansi_c.mode==configt::ansi_ct::flavourt::VISUAL_STUDIO)
+  {
     return signed_int_type();
-  else if(max_value<(mp_integer(1)<<config.ansi_c.int_width) &&
-          min_value>=0)
-    return unsigned_int_type();
-  else if(max_value<(mp_integer(1)<<config.ansi_c.long_int_width) &&
-          min_value>=0)
-    return unsigned_long_int_type();
-  else if(max_value<(mp_integer(1)<<config.ansi_c.long_long_int_width) &&
-          min_value>=0)
-    return unsigned_long_long_int_type();
-  else if(max_value<(mp_integer(1)<<(config.ansi_c.long_int_width-1)) &&
-          min_value>=-(mp_integer(1)<<(config.ansi_c.long_int_width-1)))
-    return signed_long_int_type();
+  }
   else
-    return signed_long_long_int_type();
+  {
+    // enum constants are at least 'int', but may be made larger.
+    // 'Packing' has no influence.
+    if(max_value<(mp_integer(1)<<(config.ansi_c.int_width-1)) &&
+       min_value>=-(mp_integer(1)<<(config.ansi_c.int_width-1)))
+      return signed_int_type();
+    else if(max_value<(mp_integer(1)<<config.ansi_c.int_width) &&
+            min_value>=0)
+      return unsigned_int_type();
+    else if(max_value<(mp_integer(1)<<config.ansi_c.long_int_width) &&
+            min_value>=0)
+      return unsigned_long_int_type();
+    else if(max_value<(mp_integer(1)<<config.ansi_c.long_long_int_width) &&
+            min_value>=0)
+      return unsigned_long_long_int_type();
+    else if(max_value<(mp_integer(1)<<(config.ansi_c.long_int_width-1)) &&
+            min_value>=-(mp_integer(1)<<(config.ansi_c.long_int_width-1)))
+      return signed_long_int_type();
+    else
+      return signed_long_long_int_type();
+  }
 }
 
 /*******************************************************************\
@@ -1071,49 +1078,56 @@ typet c_typecheck_baset::enum_underlying_type(
   const mp_integer &max_value,
   bool is_packed) const
 {
-  if(min_value<0)
+  if(config.ansi_c.mode==configt::ansi_ct::flavourt::VISUAL_STUDIO)
   {
-    // We'll want a signed type.
-
-    if(is_packed)
-    {
-      // If packed, there are smaller options.
-      if(max_value<(mp_integer(1)<<(config.ansi_c.char_width-1)) &&
-         min_value>=-(mp_integer(1)<<(config.ansi_c.char_width-1)))
-        return signed_char_type();
-      else if(max_value<(mp_integer(1)<<(config.ansi_c.short_int_width-1)) &&
-              min_value>=-(mp_integer(1)<<(config.ansi_c.short_int_width-1)))
-        return signed_short_int_type();
-    }
-      
-    if(max_value<(mp_integer(1)<<(config.ansi_c.int_width-1)) &&
-       min_value>=-(mp_integer(1)<<(config.ansi_c.int_width-1)))
-      return signed_int_type();
-    else if(max_value<(mp_integer(1)<<(config.ansi_c.long_int_width-1)) &&
-            min_value>=-(mp_integer(1)<<(config.ansi_c.long_int_width-1)))
-      return signed_long_int_type();
-    else
-      return signed_long_long_int_type();
+    return signed_int_type();
   }
   else
   {
-    // We'll want an unsigned type.
-    
-    if(is_packed)
+    if(min_value<0)
     {
-      // If packed, there are smaller options.
-      if(max_value<(mp_integer(1)<<config.ansi_c.char_width))
-        return unsigned_char_type();
-      else if(max_value<(mp_integer(1)<<config.ansi_c.short_int_width))
-        return unsigned_short_int_type();
+      // We'll want a signed type.
+
+      if(is_packed)
+      {
+        // If packed, there are smaller options.
+        if(max_value<(mp_integer(1)<<(config.ansi_c.char_width-1)) &&
+           min_value>=-(mp_integer(1)<<(config.ansi_c.char_width-1)))
+          return signed_char_type();
+        else if(max_value<(mp_integer(1)<<(config.ansi_c.short_int_width-1)) &&
+                min_value>=-(mp_integer(1)<<(config.ansi_c.short_int_width-1)))
+          return signed_short_int_type();
+      }
+        
+      if(max_value<(mp_integer(1)<<(config.ansi_c.int_width-1)) &&
+         min_value>=-(mp_integer(1)<<(config.ansi_c.int_width-1)))
+        return signed_int_type();
+      else if(max_value<(mp_integer(1)<<(config.ansi_c.long_int_width-1)) &&
+              min_value>=-(mp_integer(1)<<(config.ansi_c.long_int_width-1)))
+        return signed_long_int_type();
+      else
+        return signed_long_long_int_type();
     }
-      
-    if(max_value<(mp_integer(1)<<config.ansi_c.int_width))
-      return unsigned_int_type();
-    else if(max_value<(mp_integer(1)<<config.ansi_c.long_int_width))
-      return unsigned_long_int_type();
     else
-      return unsigned_long_long_int_type();
+    {
+      // We'll want an unsigned type.
+      
+      if(is_packed)
+      {
+        // If packed, there are smaller options.
+        if(max_value<(mp_integer(1)<<config.ansi_c.char_width))
+          return unsigned_char_type();
+        else if(max_value<(mp_integer(1)<<config.ansi_c.short_int_width))
+          return unsigned_short_int_type();
+      }
+        
+      if(max_value<(mp_integer(1)<<config.ansi_c.int_width))
+        return unsigned_int_type();
+      else if(max_value<(mp_integer(1)<<config.ansi_c.long_int_width))
+        return unsigned_long_int_type();
+      else
+        return unsigned_long_long_int_type();
+    }
   }
 }