Changeset ffec1bf for src/Validate

Timestamp:

Jul 25, 2022, 2:23:28 PM (4 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

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

Children:

4c48be0, 5cf1228, def751f

Parents:

9e23b446 (diff), 1f950c3b (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/Validate

Files:

• Autogen.cpp (modified) (4 diffs)
• Autogen.hpp (modified) (1 diff)
• CompoundLiteral.hpp (modified) (1 diff)
• EliminateTypedef.cpp (modified) (3 diffs)
• EnumAndPointerDecay.cpp (added)
• EnumAndPointerDecay.hpp (added)
• FindSpecialDecls.h (modified) (2 diffs)
• FixQualifiedTypes.cpp (modified) (2 diffs)
• FixQualifiedTypes.hpp (modified) (2 diffs)
• FixReturnTypes.cpp (added)
• FixReturnTypes.hpp (added)
• ForallPointerDecay.hpp (modified) (1 diff)
• GenericParameter.cpp (modified) (1 diff)
• GenericParameter.hpp (modified) (2 diffs)
• HoistStruct.hpp (modified) (1 diff)
• HoistTypeDecls.cpp (added)
• HoistTypeDecls.hpp (added)
• LabelAddressFixer.cpp (modified) (1 diff)
• LabelAddressFixer.hpp (modified) (2 diffs)
• LinkReferenceToTypes.cpp (added)
• LinkReferenceToTypes.hpp (added)
• ReplaceTypedef.cpp (added)
• ReplaceTypedef.hpp (added)
• VerifyCtorDtorAssign.cpp (added)
• VerifyCtorDtorAssign.hpp (added)
• module.mk (modified) (2 diffs)

src/Validate/Autogen.cpp

@@ -28 +28 @@
 #include "AST/DeclReplacer.hpp"
 #include "AST/Expr.hpp"
+#include "AST/Inspect.hpp"
 #include "AST/Pass.hpp"
 #include "AST/Stmt.hpp"
@@ -121 +122 @@
 
         // Built-ins do not use autogeneration.
-        bool shouldAutogen() const final { return !decl->linkage.is_builtin; }
+        bool shouldAutogen() const final { return !decl->linkage.is_builtin && !structHasFlexibleArray(decl); }
 private:
         void genFuncBody( ast::FunctionDecl * decl ) final;
@@ -183 +184 @@
         {
                 // TODO: These functions are somewhere between instrinsic and autogen,
-                // could possibly use a new linkage type. For now we just make them
-                // intrinsic to code-gen them as C assignments.
-                proto_linkage = ast::Linkage::Intrinsic;
+                // could possibly use a new linkage type. For now we just make the
+                // basic ones intrinsic to code-gen them as C assignments.
+                const auto & real_type = decl->base;
+                const auto & basic = real_type.as<ast::BasicType>();
+                if(!real_type || (basic && basic->isInteger())) proto_linkage = ast::Linkage::Intrinsic;
         }
 
@@ -402 +405 @@
         auto retval = srcParam();
         retval->name = "_ret";
-        // xxx - Adding this unused attribute can slience unused variable warning
-        // However, some code might not be compiled as expected
-        // Temporarily disabled
-        // retval->attributes.push_back(new ast::Attribute("unused"));
         return genProto( "?=?", { dstParam(), srcParam() }, { retval } );
 }

src/Validate/Autogen.hpp

@@ -22 +22 @@
 namespace Validate {
 
+/// Generate routines for all data types in the translation unit.
+/// A lot of passes have to happen either before or after this pass.
 void autogenerateRoutines( ast::TranslationUnit & translationUnit );
 

src/Validate/CompoundLiteral.hpp

@@ -23 +23 @@
 
 /// Use variables to implement compound literals.
+/// Must happen after auto-gen routines are added.
 void handleCompoundLiterals( ast::TranslationUnit & translationUnit );
 

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/FindSpecialDecls.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// FindSpecialDeclarations.h --
+// FindSpecialDeclarations.h -- Find special declarations used in the compiler.
 //
 // Author           : Rob Schluntz
@@ -43 +43 @@
         void findSpecialDecls( std::list< Declaration * > & translationUnit );
 
-/// find and remember some of the special declarations that are useful for
+/// Find and remember some of the special declarations that are useful for
 /// generating code, so that they do not have to be discovered multiple times.
 void findGlobalDecls( ast::TranslationUnit & translationUnit );

src/Validate/FixQualifiedTypes.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// FixQualifiedTypes.cpp --
+// FixQualifiedTypes.cpp -- Replace the qualified type with a direct type.
 //
 // Author           : Andrew Beach
@@ -76 +76 @@
                                                         ret->qualifiers = type->qualifiers;
                                                         ast::TypeSubstitution sub( aggr->params, instp->params );
-                                                        // = parent->genericSubstitution();
                                                         auto result = sub.apply(ret);
                                                         return result.node.release();

src/Validate/FixQualifiedTypes.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// FixQualifiedTypes.hpp --
+// FixQualifiedTypes.hpp -- Replace the qualified type with a direct type.
 //
 // Author           : Andrew Beach
@@ -22 +22 @@
 namespace Validate {
 
+/// Replaces qualified types with an unqualified NamedTypeDecl.
+/// Must happen after Link References To Types,
+/// because aggregate members are accessed.
 void fixQualifiedTypes( ast::TranslationUnit & translationUnit );
 

src/Validate/ForallPointerDecay.hpp

@@ -29 +29 @@
 /// Also checks that operator names are used properly on functions and
 /// assigns unique IDs. This is a "legacy" pass.
+/// Must be after implement concurrent keywords; because uniqueIds must be
+/// set on declaration before resolution.
+/// Must happen before auto-gen routines are added.
 void decayForallPointers( ast::TranslationUnit & transUnit );
 

src/Validate/GenericParameter.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// GenericParameter.hpp --
+// GenericParameter.hpp -- Generic parameter related passes.
 //
 // Author           : Andrew Beach

src/Validate/GenericParameter.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// GenericParameter.hpp --
+// GenericParameter.hpp -- Generic parameter related passes.
 //
 // Author           : Andrew Beach
@@ -23 +23 @@
 
 /// Perform substutions for generic parameters and fill in defaults.
+/// Check as early as possible, but it can't happen before Link References to
+/// Types and observed failing when attempted before eliminate typedef.
 void fillGenericParameters( ast::TranslationUnit & translationUnit );
 

src/Validate/HoistStruct.hpp

@@ -22 +22 @@
 namespace Validate {
 
-/// Flattens nested type declarations.
+/// Flattens nested type declarations. (Run right after Fix Qualified Types.)
 void hoistStruct( ast::TranslationUnit & translationUnit );
 

src/Validate/LabelAddressFixer.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// LabelAddressFixer.cpp --
+// LabelAddressFixer.cpp -- Create label address expressions.
 //
 // Author           : Andrew Beach

src/Validate/LabelAddressFixer.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// LabelAddressFixer.hpp --
+// LabelAddressFixer.hpp -- Create label address expressions.
 //
 // Author           : Andrew Beach
@@ -20 +20 @@
 namespace Validate {
 
+/// Label addresses are not actually created in the parser, this pass finds
+/// the patterns that represent the label address expression.
 void fixLabelAddresses( ast::TranslationUnit & translationUnit );
 

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 \
         Validate/LabelAddressFixer.cpp \
         Validate/LabelAddressFixer.hpp \
+        Validate/LinkReferenceToTypes.cpp \
+        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)