Changeset 332e93a for src/CodeGen

Timestamp:

Feb 4, 2025, 9:18:54 PM (11 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

090b076

Parents:

985ff5f (diff), 1ee74df (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/CodeGen

Files:

• CodeGenerator.cpp (modified) (4 diffs)
• CodeGenerator.hpp (modified) (1 diff)
• GenType.cpp (modified) (2 diffs)
• Generate.cpp (modified) (2 diffs)

src/CodeGen/CodeGenerator.cpp

@@ -130 +130 @@
         // TODO: Which means the ast::Pass is just providing a default no visit?
         visit_children = false;
+        changeState_ArgToIntrinsic(false);
 }
 
@@ -466 +467 @@
                 if ( var->var->linkage == ast::Linkage::Intrinsic &&
                                 ( opInfo = operatorLookup( var->var->name ) ) ) {
+                        changeState_ArgToIntrinsic(true);
                         auto arg = expr->args.begin();
                         switch ( opInfo->type ) {
@@ -558 +560 @@
         if ( auto name = expr->func.as<ast::NameExpr>() ) {
                 if ( const OperatorInfo * opInfo = operatorLookup( name->name ) ) {
+                        changeState_ArgToIntrinsic(true);
                         auto arg = expr->args.begin();
                         switch ( opInfo->type ) {
@@ -743 +746 @@
         extension( expr );
         const OperatorInfo * opInfo;
-        if ( expr->var->linkage == ast::Linkage::Intrinsic
+        if ( visitingArgToIntrinsic
+                        && options.genC
+                        && dynamic_cast<ast::ZeroType const *>( expr->var->get_type() ) ) {
+                // int * p; p = 0;               ==>  ?=?( p, (zero_t){} );  ==>  p = 0;
+                // void f( zero_t z ) { g(z); }  ==>  g(z);                  ==>  g(z);
+                // (we are at the last '==>')
+                output << "0";
+        } else if ( expr->var->linkage == ast::Linkage::Intrinsic
                         && ( opInfo = operatorLookup( expr->var->name ) )
                         && opInfo->type == OT_CONSTANT ) {

src/CodeGen/CodeGenerator.hpp

@@ -181 +181 @@
         void handleTypedef( ast::NamedTypeDecl const * type );
         std::string mangleName( ast::DeclWithType const * decl );
+
+        bool nextVisitedNodeIsArgToIntrinsic = false;
+        bool visitingArgToIntrinsic = false;
+        void changeState_ArgToIntrinsic( bool newValue ) {
+                GuardValue( visitingArgToIntrinsic ) = nextVisitedNodeIsArgToIntrinsic;
+                GuardValue( nextVisitedNodeIsArgToIntrinsic ) = newValue;
+        }
 };
 

src/CodeGen/GenType.cpp

@@ -268 +268 @@
 void GenType::postvisit( ast::ZeroType const * type ) {
         // Ideally these wouldn't hit codegen at all, but should be safe to make them ints.
-        result = (options.pretty ? "zero_t " : "long int ") + result;
+        result = ( options.genC ? "long int /*zero_t*/ " : "zero_t " ) + result;
         handleQualifiers( type );
 }
@@ -274 +274 @@
 void GenType::postvisit( ast::OneType const * type ) {
         // Ideally these wouldn't hit codegen at all, but should be safe to make them ints.
-        result = (options.pretty ? "one_t " : "long int ") + result;
+        result = ( options.genC ? "long int /*one_t*/ " : "one_t " ) + result;
         handleQualifiers( type );
 }

src/CodeGen/Generate.cpp

@@ -46 +46 @@
                 }
         };
+
+        struct ZeroOneObjectHider final {
+                ast::ObjectDecl const * postvisit( ast::ObjectDecl const * decl ) {
+                        if ( decl->type.as<ast::ZeroType>() || decl->type.as<ast::OneType>() ) {
+                                ast::ObjectDecl * mutDecl = ast::mutate( decl );
+                                mutDecl->attributes.push_back( new ast::Attribute( "unused" ) );
+                                return mutDecl;
+                        }
+                        return decl;
+                }
+        };
 } // namespace
 
@@ -52 +63 @@
         erase_if( translationUnit.decls, shouldClean );
         ast::Pass<TreeCleaner>::run( translationUnit );
+        ast::Pass<ZeroOneObjectHider>::run( translationUnit );
 
         ast::Pass<CodeGenerator> cgv( os,