Changeset def751f for src/Validate

Timestamp:

Jul 25, 2022, 3:17:25 PM (21 months ago)

Author:

JiadaL <j82liang@…>

Branches:

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

Children:

b0d9ff7

Parents:

4e2befe3 (diff), ffec1bf (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' into qualifiedEnum

Location:

src/Validate

Files:

• Autogen.hpp (modified) (1 diff)
• CompoundLiteral.hpp (modified) (1 diff)
• EnumAndPointerDecay.cpp (modified) (1 diff)
• EnumAndPointerDecay.hpp (modified) (2 diffs)
• FindSpecialDecls.h (modified) (2 diffs)
• FixQualifiedTypes.cpp (modified) (2 diffs)
• FixQualifiedTypes.hpp (modified) (2 diffs)
• FixReturnTypes.cpp (modified) (1 diff)
• FixReturnTypes.hpp (modified) (2 diffs)
• ForallPointerDecay.hpp (modified) (1 diff)
• GenericParameter.cpp (modified) (1 diff)
• GenericParameter.hpp (modified) (2 diffs)
• HoistStruct.hpp (modified) (1 diff)
• HoistTypeDecls.cpp (modified) (1 diff)
• HoistTypeDecls.hpp (modified) (2 diffs)
• LabelAddressFixer.cpp (modified) (1 diff)
• LabelAddressFixer.hpp (modified) (2 diffs)
• LinkReferenceToTypes.hpp (modified) (1 diff)
• ReplaceTypedef.cpp (modified) (7 diffs)
• ReplaceTypedef.hpp (modified) (2 diffs)
• VerifyCtorDtorAssign.cpp (modified) (1 diff)
• VerifyCtorDtorAssign.hpp (modified) (2 diffs)

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/EnumAndPointerDecay.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// EnumAndPointerDecay.cpp --
+// EnumAndPointerDecay.cpp -- Normalizes enumerations and types in functions.
 //
 // Author           : Andrew Beach

src/Validate/EnumAndPointerDecay.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// EnumAndPointerDecay.hpp --
+// EnumAndPointerDecay.hpp -- Normalizes enumerations and types in functions.
 //
 // Author           : Andrew Beach
@@ -22 +22 @@
 namespace Validate {
 
+/// Fix the parameter and return types of functions. Also assigns types to
+/// enumeration values. This must happen before Link Reference to Types,
+/// it needs correct types for mangling, and before auto-gen.
 void decayEnumsAndPointers( ast::TranslationUnit & translationUnit );
 

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/FixReturnTypes.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// FixReturnTypes.cpp --
+// FixReturnTypes.cpp -- Unifies the representation of return types.
 //
 // Author           : Andrew Beach

src/Validate/FixReturnTypes.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// FixReturnTypes.hpp --
+// FixReturnTypes.hpp -- Unifies the representation of return types.
 //
 // Author           : Andrew Beach
@@ -22 +22 @@
 namespace Validate {
 
-// This pass needs to happen early so that other passes can find tuple types
-// in the right places, especially for function return types.
+/// This pass needs to happen early so that other passes can find tuple types
+/// in the right places, especially for function return types.
+/// Must happen before auto-gen.
 void fixReturnTypes( 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/HoistTypeDecls.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// HoistTypeDecls.cpp --
+// HoistTypeDecls.cpp -- Hoists declarations of implicitly declared types.
 //
 // Author           : Andrew Beach

src/Validate/HoistTypeDecls.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// HoistTypeDecls.hpp --
+// HoistTypeDecls.hpp -- Hoists declarations of implicitly declared types.
 //
 // Author           : Andrew Beach
@@ -22 +22 @@
 namespace Validate {
 
+/// There are some places where a type can be declared but are usually only
+/// referenced (with an *InstType). This inserts the declarations before
+/// they are referenced.
 void hoistTypeDecls( 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/LinkReferenceToTypes.hpp

@@ -22 +22 @@
 namespace Validate {
 
+/// Fills in the base value of various instance types, and some related
+/// adjustments, such as setting the sized flag.
+/// Because of the sized flag, it must happen before auto-gen.
 void linkReferenceToTypes( ast::TranslationUnit & translationUnit );
 

src/Validate/ReplaceTypedef.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ReplaceTypedef.cpp --
+// ReplaceTypedef.cpp -- Fill in all typedefs with the underlying type.
 //
 // Author           : Andrew Beach
 // Created On       : Tue Jun 29 14:59:00 2022
 // Last Modified By : Andrew Beach
-// Last Modified On : Mon Jul 12 14:17:00 2022
-// Update Count     : 0
+// Last Modified On : Wed Jul 13 14:45:00 2022
+// Update Count     : 1
 //
 
@@ -63 +63 @@
         void previsit( ast::TraitDecl const * );
 
-        void previsit( ast::FunctionType const * );
-
         template<typename AggrDecl>
         void addImplicitTypedef( AggrDecl * aggDecl );
@@ -78 +76 @@
         CodeLocation const * nearestLocation = nullptr;
         int scopeLevel;
-        bool inFunctionType = false;
+        bool isAtFunctionTop = false;
 };
 
@@ -105 +103 @@
                 ast::Type * ret = ast::deepCopy( def->second.first->base );
                 ret->qualifiers |= type->qualifiers;
-                // GCC ignores certain attributes if they arrive by typedef,
-                // this mimics that.
-                // TODO: This might cover too much, it should just cover arguments
-                //   and return values of a function.
-                if ( visitor->isInFunction() ) {
+                // We ignore certain attributes on function parameters if they arrive
+                // by typedef. GCC appears to do the same thing.
+                if ( isAtFunctionTop ) {
                         erase_if( ret->attributes, isNonParameterAttribute );
                 }
@@ -207 +203 @@
         GuardScope( typedefNames );
         GuardScope( typedeclNames );
+        GuardValue( isAtFunctionTop ) = true;
 }
 
@@ -262 +259 @@
         GuardScope( typedefNames );
         GuardScope( typedeclNames );
+        GuardValue( isAtFunctionTop ) = false;
         scopeLevel += 1;
 }
@@ -292 +290 @@
         GuardScope( typedefNames );
         GuardScope( typedeclNames );
-}
-
-void ReplaceTypedefCore::previsit( ast::FunctionType const * ) {
-        GuardValue( inFunctionType ) = true;
 }
 

src/Validate/ReplaceTypedef.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ReplaceTypedef.hpp --
+// ReplaceTypedef.hpp -- Fill in all typedefs with the underlying type.
 //
 // Author           : Andrew Beach
@@ -22 +22 @@
 namespace Validate {
 
+/// Uses of typedef are replaced with the type in the typedef.
 void replaceTypedef( ast::TranslationUnit & translationUnit );
 

src/Validate/VerifyCtorDtorAssign.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// VerifyCtorDtorAssign.cpp --
+// VerifyCtorDtorAssign.cpp -- Check the form of operators.
 //
 // Author           : Andrew Beach

src/Validate/VerifyCtorDtorAssign.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// VerifyCtorDtorAssign.hpp --
+// VerifyCtorDtorAssign.hpp -- Check the form of operators.
 //
 // Author           : Andrew Beach
@@ -22 +22 @@
 namespace Validate {
 
+/// Check that constructors, destructors and assignments all have the correct
+/// form. Must happen before auto-gen or anything that examines operators.
 void verifyCtorDtorAssign( ast::TranslationUnit & translationUnit );