Merge pull request #128 from chaoticgd/builtinfixes

Fix classification of builtins for some compiler versions
chaoticgd · Oct 22, 2023 · 628938f · 628938f
2 parents fb67c72 + 87fab75
commit 628938f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## v1.2.1
 
 - Fixed detection of bitfields where the underlying type is a typedef.
+- Fixed a rare bug where unsigned 32-bit integer types were incorrectly classified as 64-bit types.
 - Improved how floating point literals are printed for global data.
 
 ## v1.2

diff --git a/ccc/ast.cpp b/ccc/ast.cpp
@@ -377,6 +377,10 @@ static bool detect_bitfield(const StabsField& field, const StabsToAstState& stat
 		}
 	}
 
+	if(underlying_type_size_bits == 0) {
+		return false;
+	}
+
 	return field.size_bits != underlying_type_size_bits;
 }
 

diff --git a/ccc/stabs.cpp b/ccc/stabs.cpp
@@ -411,7 +411,7 @@ static BuiltInClass classify_range(const std::string& low, const std::string& hi
 		{"000000000000000000000000", "001777777777777777777777", BuiltInClass::UNSIGNED_64},
 		{"00000000000000000000000000000000000000000000", "00000000000000000000001777777777777777777777", BuiltInClass::UNSIGNED_64},
 		{"0000000000000", "01777777777777777777777", BuiltInClass::UNSIGNED_64}, // iop
-		{"0", "4294967295", BuiltInClass::UNSIGNED_64},
+		{"0", "18446744073709551615", BuiltInClass::UNSIGNED_64},
 		{"001000000000000000000000", "000777777777777777777777", BuiltInClass::SIGNED_64},
 		{"00000000000000000000001000000000000000000000", "00000000000000000000000777777777777777777777", BuiltInClass::SIGNED_64},
 		{"01000000000000000000000", "0777777777777777777777", BuiltInClass::SIGNED_64}, // iop
-Original file line number
+Diff line change
@@ Expand Up @@
     		}
     	}
+    	if(underlying_type_size_bits == 0) {
+    		return false;
+    	}
     	return field.size_bits != underlying_type_size_bits;
     }
@@ Expand Down @@