Changeset 22a0e87

Timestamp:

Oct 27, 2022, 3:50:29 PM (2 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master

Children:

28372f7, 93d2219

Parents:

88ac843e (diff), 0026d67 (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

Files:

• AST/Type.cpp (modified) (2 diffs)
• AST/Type.hpp (modified) (1 diff)
• GenPoly/GenPoly.cc (modified) (5 diffs)
• GenPoly/GenPoly.h (modified) (6 diffs)
• GenPoly/ScrubTyVars.cc (modified) (4 diffs)
• ResolvExpr/SatisfyAssertions.cpp (modified) (1 diff)
• SymTab/Mangler.cc (modified) (4 diffs)
• SymTab/Mangler.h (modified) (4 diffs)
• Virtual/ExpandCasts.cc (modified) (2 diffs)

src/AST/Type.cpp

@@ -147 +147 @@
 // --- TypeInstType
 
+bool TypeInstType::operator==( const TypeInstType & other ) const {
+        return base == other.base
+                && formal_usage == other.formal_usage
+                && expr_id == other.expr_id;
+}
+
 TypeInstType::TypeInstType( const TypeDecl * b,
         CV::Qualifiers q, std::vector<ptr<Attribute>> && as )
@@ -157 +163 @@
 
 bool TypeInstType::isComplete() const { return base->sized; }
+
+std::string TypeInstType::TypeEnvKey::typeString() const {
+        return std::string("_") + std::to_string(formal_usage)
+                + "_" + std::to_string(expr_id) + "_" + base->name;
+}
+
+bool TypeInstType::TypeEnvKey::operator==(
+                const TypeInstType::TypeEnvKey & other ) const {
+        return base == other.base
+                && formal_usage == other.formal_usage
+                && expr_id == other.expr_id;
+}
+
+bool TypeInstType::TypeEnvKey::operator<(
+                const TypeInstType::TypeEnvKey & other ) const {
+        // TypeEnvKey ordering is an arbitrary total ordering.
+        // It doesn't mean anything but allows for a sorting.
+        if ( base < other.base ) {
+                return true;
+        } else if ( other.base < base ) {
+                return false;
+        } else if ( formal_usage < other.formal_usage ) {
+                return true;
+        } else if ( other.formal_usage < formal_usage ) {
+                return false;
+        } else {
+                return expr_id < other.expr_id;
+        }
+}
 
 // --- TupleType

src/AST/Type.hpp

@@ -408 +408 @@
 
                 TypeEnvKey() = default;
-                TypeEnvKey(const TypeDecl * base, int formal_usage = 0, int expr_id = 0): base(base), formal_usage(formal_usage), expr_id(expr_id) {}
-                TypeEnvKey(const TypeInstType & inst): base(inst.base), formal_usage(inst.formal_usage), expr_id(inst.expr_id) {}
-                std::string typeString() const { return std::string("_") + std::to_string(formal_usage) + "_" + std::to_string(expr_id) + "_" + base->name; }
-                bool operator==(const TypeEnvKey & other) const { return base == other.base && formal_usage == other.formal_usage && expr_id == other.expr_id; }
+                TypeEnvKey(const TypeDecl * base, int formal_usage = 0, int expr_id = 0)
+                : base(base), formal_usage(formal_usage), expr_id(expr_id) {}
+                TypeEnvKey(const TypeInstType & inst)
+                : base(inst.base), formal_usage(inst.formal_usage), expr_id(inst.expr_id) {}
+                std::string typeString() const;
+                bool operator==(const TypeEnvKey & other) const;
+                bool operator<(const TypeEnvKey & other) const;
         };
 
-        bool operator==(const TypeInstType & other) const { return base == other.base && formal_usage == other.formal_usage && expr_id == other.expr_id; }
+        bool operator==(const TypeInstType & other) const;
 
         TypeInstType(

src/GenPoly/GenPoly.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Oct  7 15:25:00 2022
-// Update Count     : 16
+// Last Modified On : Mon Oct 24 15:19:00 2022
+// Update Count     : 17
 //
 
@@ -194 +194 @@
 
         if ( auto inst = dynamic_cast< const ast::TypeInstType * >( type ) ) {
-                if ( typeVars.find( inst->typeString() ) != typeVars.end() ) return type;
+                if ( typeVars.find( *inst ) != typeVars.end() ) return type;
         } else if ( auto array = dynamic_cast< const ast::ArrayType * >( type ) ) {
                 return isPolyType( array->base, subst );
@@ -227 +227 @@
 
         if ( auto inst = dynamic_cast<ast::TypeInstType const *>( type ) ) {
-                auto var = typeVars.find( inst->name );
+                auto var = typeVars.find( *inst );
                 if ( var != typeVars.end() && var->second.isComplete ) {
 
@@ -784 +784 @@
 
 void addToTypeVarMap( const ast::TypeInstType * type, TypeVarMap & typeVars ) {
-        typeVars.insert( type->typeString(), ast::TypeDecl::Data( type->base ) );
+        typeVars.insert( *type, ast::TypeDecl::Data( type->base ) );
 }
 
@@ -816 +816 @@
         }
 
-void printTypeVarMap( std::ostream &os, const TypeVarMap & typeVars ) {
-        for ( auto const & pair : typeVars ) {
-                os << pair.first << " (" << pair.second << ") ";
-        } // for
-        os << std::endl;
-}
-
 } // namespace GenPoly
 

src/GenPoly/GenPoly.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Oct  7 15:06:00 2022
-// Update Count     : 9
+// Last Modified On : Mon Oct 24 15:18:00 2022
+// Update Count     : 11
 //
 
@@ -22 +22 @@
 #include "AST/Decl.hpp"           // for TypeDecl::Data
 #include "AST/Fwd.hpp"            // for ApplicationExpr, BaseInstType, Func...
+#include "AST/Type.hpp"           // for TypeInstType::TypeEnvKey
 #include "SymTab/Mangler.h"       // for Mangler
 #include "SynTree/Declaration.h"  // for TypeDecl::Data, AggregateDecl, Type...
@@ -28 +29 @@
 namespace GenPoly {
 
-        // TODO Via some tricks this works for ast::TypeDecl::Data as well.
         typedef ErasableScopedMap< std::string, TypeDecl::Data > TyVarMap;
-        using TypeVarMap = ErasableScopedMap< std::string, ast::TypeDecl::Data >;
+        using TypeVarMap = ErasableScopedMap< ast::TypeInstType::TypeEnvKey, ast::TypeDecl::Data >;
 
         /// Replaces a TypeInstType by its referrent in the environment, if applicable
         Type* replaceTypeInst( Type* type, const TypeSubstitution* env );
+        const ast::Type * replaceTypeInst( const ast::Type *, const ast::TypeSubstitution * );
 
         /// returns polymorphic type if is polymorphic type, NULL otherwise; will look up substitution in env if provided
@@ -53 +54 @@
         /// true iff function has dynamic-layout return type under the type variable map generated from its forall-parameters
         ReferenceToType *isDynRet( FunctionType *function );
+        const ast::BaseInstType *isDynRet( const ast::FunctionType * func );
 
         /// A function needs an adapter if it returns a dynamic-layout value or if any of its parameters have dynamic-layout type
@@ -112 +114 @@
         /// Prints type variable map
         void printTyVarMap( std::ostream &os, const TyVarMap &tyVarMap );
-        void printTypeVarMap( std::ostream &os, const TypeVarMap & typeVars );
 
         /// Gets the mangled name of this type; alias for SymTab::Mangler::mangleType().
@@ -128 +129 @@
         /// Gets the name of the layout function for a given aggregate type, given its declaration
         inline std::string layoutofName( AggregateDecl *decl ) { return std::string( "_layoutof_" ) + decl->get_name(); }
+        inline std::string layoutofName( ast::AggregateDecl const * decl ) {
+                return std::string( "_layoutof_" ) + decl->name;
+        }
 
 } // namespace GenPoly

src/GenPoly/ScrubTyVars.cc

@@ -20 +20 @@
 #include "GenPoly/ErasableScopedMap.h"  // for ErasableScopedMap<>::const_it...
 #include "ScrubTyVars.h"
-#include "SymTab/Mangler.h"             // for mangle, typeMode
+#include "SymTab/Mangler.h"             // for mangleType
 #include "SynTree/Declaration.h"        // for TypeDecl, TypeDecl::Data, Typ...
 #include "SynTree/Expression.h"         // for Expression (ptr only), NameExpr
@@ -195 +195 @@
         }
 
-        auto typeVar = typeVars->find( type->name );
+        auto typeVar = typeVars->find( *type );
         if ( typeVar == typeVars->end() ) {
                 return type;
@@ -227 +227 @@
         if ( dynType ) {
                 return new ast::NameExpr( expr->location,
-                        sizeofName( Mangle::mangle( dynType, Mangle::typeMode() ) ) );
+                        sizeofName( Mangle::mangleType( dynType ) ) );
         } else {
                 return expr;
@@ -237 +237 @@
         if ( dynType ) {
                 return new ast::NameExpr( expr->location,
-                        alignofName( Mangle::mangle( dynType, Mangle::typeMode() ) ) );
+                        alignofName( Mangle::mangleType( dynType ) ) );
         } else {
                 return expr;

src/ResolvExpr/SatisfyAssertions.cpp

@@ -268 +268 @@
                 ast::ptr< ast::Type > resType = cand.expr->result;
                 cand.env.apply( resType );
-                return Mangle::mangle( resType, Mangle::typeMode() );
+                return Mangle::mangleType( resType );
         }
 

src/SymTab/Mangler.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:40:29 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jan 11 21:56:06 2021
-// Update Count     : 74
+// Last Modified By : Andrew Beach
+// Last Modified On : Fri Oct 21 16:18:00 2022
+// Update Count     : 75
 //
 #include "Mangler.h"
@@ -418 +418 @@
                         void postvisit( const ast::QualifiedType * qualType );
 
-                        std::string get_mangleName() { return mangleName; }
+                        /// The result is the current constructed mangled name.
+                        std::string result() const { return mangleName; }
                   private:
                         std::string mangleName;         ///< Mangled name being constructed
@@ -444 +445 @@
         } // namespace
 
-
         std::string mangle( const ast::Node * decl, Mangle::Mode mode ) {
-                ast::Pass<Mangler_new> mangler( mode );
-                maybeAccept( decl, mangler );
-                return mangler.core.get_mangleName();
+                return ast::Pass<Mangler_new>::read( decl, mode );
         }
 
@@ -689 +687 @@
                                         } // for
                                         for ( auto & assert : ptype->assertions ) {
-                                                ast::Pass<Mangler_new> sub_mangler(
-                                                        mangleOverridable, typeMode, mangleGenericParams, nextVarNum, varNums );
-                                                assert->var->accept( sub_mangler );
-                                                assertionNames.push_back( sub_mangler.core.get_mangleName() );
+                                                assertionNames.push_back( ast::Pass<Mangler_new>::read(
+                                                        assert->var.get(),
+                                                        mangleOverridable, typeMode, mangleGenericParams, nextVarNum, varNums ) );
                                                 acount++;
                                         } // for

src/SymTab/Mangler.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:44:03 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 22 09:45:30 2017
-// Update Count     : 15
+// Last Modified By : Andrew Beach
+// Last Modified On : Thu Oct 27 11:58:00 2022
+// Update Count     : 16
 //
 
@@ -22 +22 @@
 
 #include "AST/Bitfield.hpp"
-#include "AST/Fwd.hpp"
 #include "SynTree/SynTree.h"  // for Types
 #include "SynTree/Visitor.h"  // for Visitor, maybeAccept
@@ -33 +32 @@
 // * Currently name compression is not implemented.
 
+namespace ast {
+        class Node;
+}
 namespace ResolvExpr {
         class TypeEnvironment;
@@ -101 +103 @@
         using Mode = bitfield<mangle_flags>;
 
-        static inline Mode typeMode() { return NoOverrideable | Type; }
+        /// Mangle declaration name.
+        std::string mangle( const ast::Node * decl, Mode mode = {} );
 
-        /// Mangle declaration name
-        std::string mangle( const ast::Node * decl, Mode mode = {} );
+        /// Most common mangle configuration for types.
+        static inline std::string mangleType( const ast::Node * type ) {
+                return mangle( type, { NoOverrideable | Type } );
+        }
 
         namespace Encoding {

src/Virtual/ExpandCasts.cc

@@ -295 +295 @@
         // returns the previous declaration for error messages.
         ast::ObjectDecl const * insert( ast::ObjectDecl const * typeIdDecl ) {
-                std::string const & mangledName =
-                                Mangle::mangle( typeIdDecl->type, Mangle::typeMode() );
+                std::string mangledName = Mangle::mangleType( typeIdDecl->type );
                 ast::ObjectDecl const *& value = instances[ mangledName ];
                 if ( value ) {
@@ -310 +309 @@
 
         ast::ObjectDecl const * lookup( ast::Type const * typeIdType ) {
-                std::string const & mangledName =
-                                Mangle::mangle( typeIdType, Mangle::typeMode() );
+                std::string mangledName = Mangle::mangleType( typeIdType );
                 auto const it = instances.find( mangledName );
                 return ( instances.end() == it ) ? nullptr : it->second;