Changeset 7d7ef6f for src

Timestamp:

Feb 17, 2022, 2:35:23 PM (3 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

a556492

Parents:

51b8582

Message:

Revereted some changes and added a fix to get around the current issue (traits can't refer to traits with the same polymorphic arguments).

Location:

src

Files:

• AST/Decl.cpp (modified) (1 diff)
• SynTree/TypeSubstitution.cc (modified) (2 diffs)

src/AST/Decl.cpp

@@ -39 +39 @@
         if ( uniqueId ) return;  // ensure only set once
         uniqueId = ++lastUniqueId;
-        //idMap[ uniqueId ] = this;
+        // The extra readonly pointer is causing some reference counting issues.
+        // idMap[ uniqueId ] = this;
 }
 
 readonly<Decl> Decl::fromId( UniqueId id ) {
+        // Right now this map is always empty, so don't use it.
         assert( false );
         IdMapType::const_iterator i = idMap.find( id );

src/SynTree/TypeSubstitution.cc

@@ -146 +146 @@
 }
 
-static bool are_same( TypeInstType * left, TypeInstType * right ) {
-        if ( left->baseType && right->baseType ) {
-                return left->baseType == right->baseType;
-        } else {
-                return left->name == right->name;
-        }
-}
-
 Type * TypeSubstitution::Substituter::postmutate( TypeInstType *inst ) {
         BoundVarsType::const_iterator bound = boundVars.find( inst->name );
@@ -166 +158 @@
                 // TODO: investigate preventing type variables from being bound to themselves in the first place.
                 if ( TypeInstType * replacement = dynamic_cast< TypeInstType * >( i->second ) ) {
-                        if ( are_same( inst, replacement ) ) {
+                        if ( inst->name == replacement->name ) {
                                 return inst;
                         }