Changeset d3d54b3 for src

Timestamp:

Feb 5, 2025, 1:45:29 PM (8 weeks 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.

Location:

src

Files:

• AST/Expr.cpp (modified) (3 diffs)
• AST/Type.hpp (modified) (1 diff)
• AST/Util.cpp (modified) (2 diffs)
• AST/Util.hpp (modified) (2 diffs)
• main.cpp (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 );