Changeset 1931bb0

Timestamp:

Jul 12, 2022, 3:21:18 PM (15 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

b9f8274

Parents:

9c6443e

Message:

Converted 'Validate A' to the new AST. There some utility changes as well.

Location:

src

Files:

• AST/Convert.cpp (modified) (3 diffs)
• AST/Decl.hpp (modified) (1 diff)
• CodeGen/CodeGenerator.cc (modified) (3 diffs)
• CodeGen/CodeGenerator.h (modified) (3 diffs)
• CodeGen/GenType.cc (modified) (1 diff)
• SymTab/FixFunction.cc (modified) (3 diffs)
• SymTab/FixFunction.h (modified) (3 diffs)
• Validate/EliminateTypedef.cpp (modified) (3 diffs)
• Validate/EnumAndPointerDecay.cpp (added)
• Validate/EnumAndPointerDecay.hpp (added)
• Validate/FixReturnTypes.cpp (added)
• Validate/FixReturnTypes.hpp (added)
• Validate/HoistTypeDecls.cpp (added)
• Validate/HoistTypeDecls.hpp (added)
• Validate/ReplaceTypedef.cpp (added)
• Validate/ReplaceTypedef.hpp (added)
• Validate/VerifyCtorDtorAssign.cpp (added)
• Validate/VerifyCtorDtorAssign.hpp (added)
• Validate/module.mk (modified) (3 diffs)
• main.cc (modified) (5 diffs)

src/AST/Convert.cpp

@@ -168 +168 @@
                 auto attr = get<Attribute>().acceptL( node->attributes );
 
+                // This field can be unset very early on (Pre-FixReturnTypes).
+                auto newType = (type) ? type->clone() : nullptr;
+
                 auto decl = new ObjectDecl(
                         node->name,
@@ -173 +176 @@
                         LinkageSpec::Spec( node->linkage.val ),
                         bfwd,
-                        type->clone(),
+                        newType,
                         nullptr, // prevent infinite loop
                         attr,
@@ -1579 +1582 @@
 
         virtual void visit( const ObjectDecl * old ) override final {
+                if ( inCache( old ) ) {
+                        return;
+                }
                 auto&& type = GET_ACCEPT_1(type, Type);
                 auto&& init = GET_ACCEPT_1(init, Init);
                 auto&& bfwd = GET_ACCEPT_1(bitfieldWidth, Expr);
                 auto&& attr = GET_ACCEPT_V(attributes, Attribute);
-                if ( inCache( old ) ) {
-                        return;
-                }
+
                 auto decl = new ast::ObjectDecl(
                         old->location,

src/AST/Decl.hpp

@@ -315 +315 @@
 
         EnumDecl( const CodeLocation& loc, const std::string& name,
-                std::vector<ptr<Attribute>>&& attrs = {}, Linkage::Spec linkage = Linkage::Cforall, Type * base = nullptr,
+                std::vector<ptr<Attribute>>&& attrs = {}, Linkage::Spec linkage = Linkage::Cforall, Type const * base = nullptr,
                 std::unordered_map< std::string, long long > enumValues = std::unordered_map< std::string, long long >() )
         : AggregateDecl( loc, name, std::move(attrs), linkage ), base(base), enumValues(enumValues) {}

src/CodeGen/CodeGenerator.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Feb  2 20:30:30 2022
-// Update Count     : 541
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Jun 29 14:34:00 2022
+// Update Count     : 542
 //
 #include "CodeGenerator.h"
@@ -18 +18 @@
 #include <list>                      // for _List_iterator, list, list<>::it...
 
+#include "AST/Decl.hpp"              // for DeclWithType
 #include "Common/UniqueName.h"       // for UniqueName
 #include "Common/utility.h"          // for CodeLocation, toString
@@ -1238 +1239 @@
                 } // if
         }
+
+std::string genName( ast::DeclWithType const * decl ) {
+        if ( const OperatorInfo * opInfo = operatorLookup( decl->name ) ) {
+                return opInfo->outputName;
+        } else {
+                return decl->name;
+        }
+}
+
 } // namespace CodeGen
 

src/CodeGen/CodeGenerator.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Feb  1 09:23:21 2022
-// Update Count     : 64
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Jun 29 14:32:00 2022
+// Update Count     : 65
 //
 
@@ -26 +26 @@
 #include "SynTree/Visitor.h"      // for Visitor
 #include "SynTree/SynTree.h"      // for Visitor Nodes
+
+namespace ast {
+        class DeclWithType;
+}
 
 namespace CodeGen {
@@ -182 +186 @@
         /// returns C-compatible name of declaration
         std::string genName( DeclarationWithType * decl );
+        std::string genName( ast::DeclWithType const * decl );
 
         inline std::ostream & operator<<( std::ostream & os, const CodeGenerator::LineEnder & endl ) {

src/CodeGen/GenType.cc

@@ -254 +254 @@
 
         void GenType::postvisit( EnumInstType * enumInst ) {
-                if ( enumInst->baseEnum->base ) {
+                if ( enumInst->baseEnum && enumInst->baseEnum->base ) {
                         typeString = genType(enumInst->baseEnum->base, "", options) + typeString;
                 } else {

src/SymTab/FixFunction.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 16:19:49 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Mar  6 23:36:59 2017
-// Update Count     : 6
+// Last Modified By : Andrew Beach
+// Last Modified On : Tue Jul 12 14:28:00 2022
+// Update Count     : 7
 //
 
@@ -122 +122 @@
                 }
 
+                void previsit( const ast::FunctionType * ) { visit_children = false; }
+
+                const ast::Type * postvisit( const ast::FunctionType * type ) {
+                        return new ast::PointerType( type );
+                }
+
                 void previsit( const ast::VoidType * ) { isVoid = true; }
 
@@ -145 +151 @@
 }
 
+const ast::Type * fixFunction( const ast::Type * type, bool & isVoid ) {
+        ast::Pass< FixFunction_new > fixer;
+        type = type->accept( fixer );
+        isVoid |= fixer.core.isVoid;
+        return type;
+}
+
 } // namespace SymTab
 

src/SymTab/FixFunction.h

@@ -10 +10 @@
 // Created On       : Sun May 17 17:02:08 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 22 09:45:55 2017
-// Update Count     : 4
+// Last Modified On : Tue Jul 12 14:19:00 2022
+// Update Count     : 5
 //
 
@@ -21 +21 @@
 namespace ast {
         class DeclWithType;
+        class Type;
 }
 
@@ -31 +32 @@
         /// Sets isVoid to true if type is void
         const ast::DeclWithType * fixFunction( const ast::DeclWithType * dwt, bool & isVoid );
+        const ast::Type * fixFunction( const ast::Type * type, bool & isVoid );
 } // namespace SymTab
 

src/Validate/EliminateTypedef.cpp

@@ -10 +10 @@
 // Created On       : Wed Apr 20 16:37:00 2022
 // Last Modified By : Andrew Beach
-// Last Modified On : Mon Apr 25 14:26:00 2022
-// Update Count     : 0
+// Last Modified On : Mon Jul 11 16:30:00 2022
+// Update Count     : 1
 //
 
@@ -28 +28 @@
 
 struct EliminateTypedefCore {
+        // Remove typedefs from inside aggregates.
         ast::StructDecl const * previsit( ast::StructDecl const * decl );
         ast::UnionDecl const * previsit( ast::UnionDecl const * decl );
+        // Remove typedefs from statement lists.
         ast::CompoundStmt const * previsit( ast::CompoundStmt const * stmt );
+        // Remove typedefs from control structure initializers.
+        ast::IfStmt const * previsit( ast::IfStmt const * stmt );
+        ast::ForStmt const * previsit( ast::ForStmt const * stmt );
+        ast::WhileDoStmt const * previsit( ast::WhileDoStmt const * stmt );
 };
 
@@ -63 +69 @@
 }
 
+ast::IfStmt const * EliminateTypedefCore::previsit( ast::IfStmt const * stmt ) {
+        return field_erase_if( stmt, &ast::IfStmt::inits, isTypedefStmt );
+}
+
+ast::ForStmt const * EliminateTypedefCore::previsit( ast::ForStmt const * stmt ) {
+        return field_erase_if( stmt, &ast::ForStmt::inits, isTypedefStmt );
+}
+
+ast::WhileDoStmt const * EliminateTypedefCore::previsit( ast::WhileDoStmt const * stmt ) {
+        return field_erase_if( stmt, &ast::WhileDoStmt::inits, isTypedefStmt );
+}
+
 } // namespace
 

src/Validate/module.mk

@@ -26 +26 @@
         Validate/EliminateTypedef.cpp \
         Validate/EliminateTypedef.hpp \
+        Validate/EnumAndPointerDecay.cpp \
+        Validate/EnumAndPointerDecay.hpp \
         Validate/FindSpecialDeclsNew.cpp \
         Validate/FixQualifiedTypes.cpp \
         Validate/FixQualifiedTypes.hpp \
+        Validate/FixReturnTypes.cpp \
+        Validate/FixReturnTypes.hpp \
         Validate/ForallPointerDecay.cpp \
         Validate/ForallPointerDecay.hpp \
@@ -37 +41 @@
         Validate/HoistStruct.cpp \
         Validate/HoistStruct.hpp \
+        Validate/HoistTypeDecls.cpp \
+        Validate/HoistTypeDecls.hpp \
         Validate/InitializerLength.cpp \
         Validate/InitializerLength.hpp \
@@ -44 +50 @@
         Validate/LinkReferenceToTypes.hpp \
         Validate/NoIdSymbolTable.hpp \
+        Validate/ReplaceTypedef.cpp \
+        Validate/ReplaceTypedef.hpp \
         Validate/ReturnCheck.cpp \
-        Validate/ReturnCheck.hpp
+        Validate/ReturnCheck.hpp \
+        Validate/VerifyCtorDtorAssign.cpp \
+        Validate/VerifyCtorDtorAssign.hpp
 
 SRCDEMANGLE += $(SRC_VALIDATE)

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Tue Jun  7 13:29:00 2022
-// Update Count     : 674
+// Last Modified On : Tue Jul 12 12:02:00 2022
+// Update Count     : 675
 //
 
@@ -78 +78 @@
 #include "Validate/CompoundLiteral.hpp"     // for handleCompoundLiterals
 #include "Validate/EliminateTypedef.hpp"    // for eliminateTypedef
+#include "Validate/EnumAndPointerDecay.hpp" // for decayEnumsAndPointers
 #include "Validate/FindSpecialDecls.h"      // for findGlobalDecls
 #include "Validate/FixQualifiedTypes.hpp"   // for fixQualifiedTypes
+#include "Validate/FixReturnTypes.hpp"      // for fixReturnTypes
 #include "Validate/ForallPointerDecay.hpp"  // for decayForallPointers
 #include "Validate/GenericParameter.hpp"    // for fillGenericParameters, tr...
 #include "Validate/HoistStruct.hpp"         // for hoistStruct
+#include "Validate/HoistTypeDecls.hpp"      // for hoistTypeDecls
 #include "Validate/InitializerLength.hpp"   // for setLengthFromInitializer
 #include "Validate/LabelAddressFixer.hpp"   // for fixLabelAddresses
 #include "Validate/LinkReferenceToTypes.hpp" // for linkReferenceToTypes
+#include "Validate/ReplaceTypedef.hpp"      // for replaceTypedef
 #include "Validate/ReturnCheck.hpp"         // for checkReturnStatements
+#include "Validate/VerifyCtorDtorAssign.hpp" // for verifyCtorDtorAssign
 #include "Virtual/ExpandCasts.h"            // for expandCasts
 
@@ -331 +336 @@
                 } // if
 
-                // add the assignment statement after the initialization of a type parameter
-                PASS( "Validate-A", SymTab::validate_A( translationUnit ) );
-
                 CodeTools::fillLocations( translationUnit );
 
@@ -346 +348 @@
 
                         forceFillCodeLocations( transUnit );
+
+                        // Must happen before auto-gen, or anything that examines ops.
+                        PASS( "Verify Ctor, Dtor & Assign", Validate::verifyCtorDtorAssign( transUnit ) );
+
+                        PASS( "Hoist Type Decls", Validate::hoistTypeDecls( transUnit ) );
+                        // Hoist Type Decls pulls some declarations out of contexts where
+                        // locations are not tracked. Perhaps they should be, but for now
+                        // the full fill solves it.
+                        forceFillCodeLocations( transUnit );
+
+                        PASS( "Replace Typedefs", Validate::replaceTypedef( transUnit ) );
+
+                        // Must happen before auto-gen.
+                        PASS( "Fix Return Types", Validate::fixReturnTypes( transUnit ) );
+
+                        // Must happen before Link Reference to Types, it needs correct
+                        // types for mangling.
+                        PASS( "Enum and Pointer Decay", Validate::decayEnumsAndPointers( transUnit ) );
 
                         // Must happen before auto-gen, because it uses the sized flag.
@@ -453 +473 @@
                         translationUnit = convert( move( transUnit ) );
                 } else {
+                        // add the assignment statement after the initialization of a type parameter
+                        PASS( "Validate-A", SymTab::validate_A( translationUnit ) );
                         PASS( "Validate-B", SymTab::validate_B( translationUnit ) );
                         PASS( "Validate-C", SymTab::validate_C( translationUnit ) );