Changeset e58dfb9 for src

Timestamp:

Feb 14, 2017, 1:53:29 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

35cd219, eed5e48

Parents:

97d246d

Message:

Fix scoping bug with generic type instantiations (thanks Rob!)

Location:

src

Files:

• Common/ScopedMap.h (modified) (1 diff)
• GenPoly/InstantiateGeneric.cc (modified) (1 diff)

src/Common/ScopedMap.h

@@ -230 +230 @@
         }
 
+        /// Finds the given key in the provided scope; returns end() for none such
+        iterator findAt( size_type scope, const Key& key ) {
+                typename Scope::iterator val = scopes[scope].find( key );
+                if ( val != scopes[scope].end() ) return iterator( scopes, val, scope );
+                return end();
+        }
+        const_iterator findAt( size_type scope, const Key& key ) const {
+                return const_iterator( const_cast< ScopedMap< Key, Value >* >(this)->findAt( scope, key ) );
+        }
+
         /// Finds the given key in the outermost scope inside the given scope where it occurs
         iterator findNext( const_iterator &it, const Key &key ) {

src/GenPoly/InstantiateGeneric.cc

@@ -122 +122 @@
                 /// Adds a value for a (key, typeList) pair to the current scope
                 void insert( Key *key, const std::list< TypeExpr* > &params, Value *value ) {
-                        instantiations[ key ].push_back( Instantiation( TypeList( params ), value ) );
+                        auto it = instantiations.findAt( instantiations.currentScope(), key );
+                        if ( it == instantiations.end() ) {
+                                instantiations.insert( key, ValueList{ Instantiation{ TypeList( params ), value } } );
+                        } else {
+                                it->second.push_back( Instantiation{ TypeList( params ), value } );
+                        }
                 }
         };