Changeset d3d54b3

Timestamp:

Feb 5, 2025, 1:45:29 PM (7 months ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

master

Children:

ab94c37

Parents:

92aeae1

Message:

Eliminate warnings due to sizeof returning type inconsistent with %zu. Fix #269.

Test

nowarn/printf-sizeof

: Activate direct test of the bug.

Tests

alloc-ERROR
extension
array-collections/dimexpr-match-c-ERRS

: Accommodate incidental changes in error-message text or generated code.

Files:

• src/AST/Expr.cpp (modified) (3 diffs)
• src/AST/Type.hpp (modified) (1 diff)
• src/AST/Util.cpp (modified) (2 diffs)
• src/AST/Util.hpp (modified) (2 diffs)
• src/main.cpp (modified) (1 diff)
• tests/.expect/alloc-ERROR.arm64.txt (moved) (moved from tests/.expect/alloc-ERROR.txt )
• tests/.expect/alloc-ERROR.x64.txt (added)
• tests/.expect/alloc-ERROR.x86.txt (added)
• tests/.expect/extension.x86.txt (modified) (3 diffs)
• tests/array-collections/.expect/dimexpr-match-c-ERRS.x86.txt (modified) (2 diffs)
• tests/nowarn/.expect/printf-sizeof.txt (modified) (1 diff)
• tests/nowarn/printf-sizeof.cfa (modified) (1 diff)

src/AST/Expr.cpp

@@ -26 +26 @@
 #include "Stmt.hpp"
 #include "Type.hpp"
+#include "Util.hpp"                // for TranslationDeps
 #include "TypeSubstitution.hpp"
 #include "Common/Utility.hpp"
@@ -281 +282 @@
 
 SizeofExpr::SizeofExpr( const CodeLocation & loc, const Type * t )
-: Expr( loc, new BasicType{ BasicKind::LongUnsignedInt } ), type( t ) {}
+: Expr( loc, ast::TranslationDeps::getSizeType() ), type( t ) {}
 
 // --- AlignofExpr
 
 AlignofExpr::AlignofExpr( const CodeLocation & loc, const Type * t )
-: Expr( loc, new BasicType{ BasicKind::LongUnsignedInt } ), type( t ) {}
+: Expr( loc, ast::TranslationDeps::getSizeType() ), type( t ) {}
 
 // --- CountofExpr
 
 CountofExpr::CountofExpr( const CodeLocation & loc, const Type * t )
-: Expr( loc, new BasicType( BasicKind::LongUnsignedInt) ), type( t ) {}
+: Expr( loc, ast::TranslationDeps::getSizeType() ), type( t ) {}
 
 // --- OffsetofExpr
 
 OffsetofExpr::OffsetofExpr( const CodeLocation & loc, const Type * ty, const DeclWithType * mem )
-: Expr( loc, new BasicType{ BasicKind::LongUnsignedInt } ), type( ty ), member( mem ) {
+: Expr( loc, ast::TranslationDeps::getSizeType() ), type( ty ), member( mem ) {
         assert( type );
         assert( member );
@@ -305 +306 @@
 OffsetPackExpr::OffsetPackExpr( const CodeLocation & loc, const StructInstType * ty )
 : Expr( loc, new ArrayType{
-        new BasicType{ BasicKind::LongUnsignedInt }, nullptr, FixedLen, DynamicDim }
+        ast::TranslationDeps::getSizeType(), nullptr, FixedLen, DynamicDim }
 ), type( ty ) {
         assert( type );

src/AST/Type.hpp

@@ -344 +344 @@
 struct TypeEnvKey;
 
-/// instance of named type alias (typedef or variable)
+/// instance of named type alias (typedef, variable, or even, just after parsing, the name of a struct)
 class TypeInstType final : public BaseInstType {
 public:

src/AST/Util.cpp

@@ -22 +22 @@
 #include "Common/Utility.hpp"
 #include "GenPoly/ScopedSet.hpp"
+#include "Decl.hpp"
+#include "Type.hpp"
 
 #include <vector>
@@ -382 +384 @@
 }
 
+namespace {
+        const TranslationUnit * transUnit = 0;
+}
+
+void TranslationDeps::evolve( TranslationUnit & u ) {
+        transUnit = &u;
+}
+
+const ast::Type * TranslationDeps::getSizeType() {
+        static const ast::Type * zd_abstract = new TypeInstType{ "size_t", TypeDecl::Kind::Dtype };
+        static const ast::Type * ld_concrete = new BasicType( BasicKind::LongUnsignedInt );
+        if ( ! transUnit ) {
+                // early state
+                // as if `size_t` in program text were freshly parsed
+                return zd_abstract;
+        } else if ( transUnit->global.sizeType ) {
+                // late state, normal run
+                // whatever size_t was defined as
+                return transUnit->global.sizeType;
+        } else {
+                // late state, no prelude (-n)
+                // placeholder: cfa-cpp is being used experimentally, stay out of the way
+                return ld_concrete;
+        }
+}
+
+
 } // namespace ast

src/AST/Util.hpp

@@ -16 +16 @@
 #pragma once
 
+#include "Fwd.hpp"
+
 namespace ast {
 
@@ -22 +24 @@
 /// Check anything that should always be true of the AST between passes.
 /// Insert this whenever you want additional debugging checks.
-void checkInvariants( TranslationUnit & transUnit );
+void checkInvariants( TranslationUnit & );
+
+/// Maintains an AST-module state for contextual information needed in
+/// ast::* implementations, notably constructors:
+///    early: while parsing, use bootstrap versions
+///    late: once a whole TranslationUnit exists, use its answers
+/// When the program is in the later state, ast::* construcors effectively get
+/// the benefit of WithTranslationUnit, without having to pass them one.
+class TranslationDeps {
+
+    TranslationDeps() = delete;
+
+    friend class SizeofExpr;
+    friend class AlignofExpr;
+    friend class CountofExpr;
+    friend class OffsetofExpr;
+    friend class OffsetPackExpr;
+
+    /// Appropriate return type for built-in expressions that report on sizes
+    static const Type * getSizeType();
+
+  public:
+    /// Transition from early to late states
+    static void evolve( TranslationUnit & );
+};
 
 }

src/main.cpp

@@ -199 +199 @@
                 Stats::Time::StopBlock();
 
+                ast::TranslationDeps::evolve( transUnit );
+
                 PASS( "Hoist Type Decls", Validate::hoistTypeDecls, transUnit );
 

tests/.expect/extension.x86.txt

@@ -120 +120 @@
 static inline void _X12_constructorFv_U1UU1U_autogen___1(__attribute__ ((unused)) union U *_X4_dstU1U_1, __attribute__ ((unused)) union U _X4_srcU1U_1){
     {
-        ((void)__builtin_memcpy(((void *)_X4_dstU1U_1), ((const void *)(&_X4_srcU1U_1)), sizeof(union U )));
+        ((void)__builtin_memcpy(((void *)_X4_dstU1U_1), ((const void *)(&_X4_srcU1U_1)), ((unsigned long int )sizeof(union U ))));
     }
 
@@ -129 +129 @@
     __attribute__ ((unused)) union U _X4_retU1U_1;
     {
-        ((void)__builtin_memcpy(((void *)_X4_dstU1U_1), ((const void *)(&_X4_srcU1U_1)), sizeof(union U )));
+        ((void)__builtin_memcpy(((void *)_X4_dstU1U_1), ((const void *)(&_X4_srcU1U_1)), ((unsigned long int )sizeof(union U ))));
     }
 
@@ -140 +140 @@
 static inline void _X12_constructorFv_U1Ui_autogen___1(__attribute__ ((unused)) union U *_X4_dstU1U_1, signed int _X1ai_1){
     {
-        ((void)__builtin_memcpy(((void *)_X4_dstU1U_1), ((const void *)(&_X1ai_1)), sizeof(signed int )));
+        ((void)__builtin_memcpy(((void *)_X4_dstU1U_1), ((const void *)(&_X1ai_1)), ((unsigned long int )sizeof(signed int ))));
     }
 

tests/array-collections/.expect/dimexpr-match-c-ERRS.x86.txt

@@ -208 +208 @@
   Address of:
     Name: a  InitAlternative: pointer to array of float with dimension of Generated Cast of:
-    Sizeof Expression on: instance of type dim7 (not function type)
-    ... with resolved type:
-      unsigned long int
-  ... to:
-    unsigned int
-  ... with resolved type:
-    unsigned int
-array-collections/dimexpr-match-c.cfa:49:1 error: Invalid application of existing declaration(s) in expression Untyped Init Expression
-  Address of:
-    Name: a  InitAlternative: pointer to array of float with dimension of Generated Cast of:
-    Sizeof Expression on: instance of type dim7 (not function type)
-    ... with resolved type:
-      unsigned long int
-  ... to:
-    unsigned int
-  ... with resolved type:
-    unsigned int
-array-collections/dimexpr-match-c.cfa:49:1 error: Invalid application of existing declaration(s) in expression Untyped Init Expression
-  Address of:
-    Name: a  InitAlternative: pointer to array of float with dimension of Generated Cast of:
-    Sizeof Expression on: instance of type dim7 (not function type)
-    ... with resolved type:
-      unsigned long int
-  ... to:
-    unsigned int
-  ... with resolved type:
-    unsigned int
-array-collections/dimexpr-match-c.cfa:49:1 error: Invalid application of existing declaration(s) in expression Untyped Init Expression
-  Address of:
-    Name: a  InitAlternative: pointer to array of float with dimension of Generated Cast of:
-    Sizeof Expression on: instance of type dim7 (not function type)
-    ... with resolved type:
-      unsigned long int
-  ... to:
-    unsigned int
-  ... with resolved type:
-    unsigned int
-array-collections/dimexpr-match-c.cfa:49:1 error: Invalid application of existing declaration(s) in expression Untyped Init Expression
-  Address of:
-    Name: a  InitAlternative: pointer to array of float with dimension of Generated Cast of:
-    Sizeof Expression on: instance of type dim7 (not function type)
-    ... with resolved type:
-      unsigned long int
-  ... to:
-    unsigned int
-  ... with resolved type:
-    unsigned int
-array-collections/dimexpr-match-c.cfa:49:1 error: Invalid application of existing declaration(s) in expression Untyped Init Expression
-  Address of:
-    Name: a  InitAlternative: pointer to array of float with dimension of Generated Cast of:
     Variable Expression: enu7: const instance of enum __anonymous0 with body
     ... with resolved type:
@@ -307 +257 @@
 array-collections/dimexpr-match-c.cfa:49:1 error: Invalid application of existing declaration(s) in expression Untyped Init Expression
   Address of:
+    Name: a  InitAlternative: pointer to array of float with dimension of Sizeof Expression on: instance of type dim7 (not function type)
+  ... with resolved type:
+    unsigned int
+array-collections/dimexpr-match-c.cfa:49:1 error: Invalid application of existing declaration(s) in expression Untyped Init Expression
+  Address of:
+    Name: a  InitAlternative: pointer to array of float with dimension of Sizeof Expression on: instance of type dim7 (not function type)
+  ... with resolved type:
+    unsigned int
+array-collections/dimexpr-match-c.cfa:49:1 error: Invalid application of existing declaration(s) in expression Untyped Init Expression
+  Address of:
+    Name: a  InitAlternative: pointer to array of float with dimension of Sizeof Expression on: instance of type dim7 (not function type)
+  ... with resolved type:
+    unsigned int
+array-collections/dimexpr-match-c.cfa:49:1 error: Invalid application of existing declaration(s) in expression Untyped Init Expression
+  Address of:
+    Name: a  InitAlternative: pointer to array of float with dimension of Sizeof Expression on: instance of type dim7 (not function type)
+  ... with resolved type:
+    unsigned int
+array-collections/dimexpr-match-c.cfa:49:1 error: Invalid application of existing declaration(s) in expression Untyped Init Expression
+  Address of:
+    Name: a  InitAlternative: pointer to array of float with dimension of Sizeof Expression on: instance of type dim7 (not function type)
+  ... with resolved type:
+    unsigned int
+array-collections/dimexpr-match-c.cfa:49:1 error: Invalid application of existing declaration(s) in expression Untyped Init Expression
+  Address of:
     Name: a  InitAlternative: pointer to variable length array of float with dimension of Generated Cast of:
     Variable Expression: _array_dim16: const unsigned int

tests/nowarn/.expect/printf-sizeof.txt

@@ -2 +2 @@
 1
 10
+0 1 2 3 4 5 6 7 8 9

tests/nowarn/printf-sizeof.cfa

@@ -11 +11 @@
 forall( [N] )
 void mary( array(char, N) & ) {
-    printf( "%zu\n", N );    
-  #if defined TRY_TRAC_269_REMAINDER
-        for ( i; N ) {
+    printf( "%zu\n", N );
+    for ( i; N ) {
         if (i > 0) printf(" ");
-        printf( "%zu", i); // FIX ME: i still getting type long unsigned int on -m32
-        }
+        printf( "%zu", i);
+    }
     printf("\n");
-  #endif
 }