Changeset 6dba8755

Timestamp:

Jul 31, 2020, 11:06:44 AM (4 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

95789be

Parents:

0c760db

Message:

I was given a trick with the indexer that fixes some scoping issues with virtual casts.

Location:

src

Files:

• Common/ScopedMap.h (modified) (1 diff)
• Virtual/ExpandCasts.cc (modified) (8 diffs)

src/Common/ScopedMap.h

@@ -93 +93 @@
 
                 reference operator* () { return *it; }
-                pointer operator-> () { return it.operator->(); }
+                pointer operator-> () const { return it.operator->(); }
 
                 iterator& operator++ () {

src/Virtual/ExpandCasts.cc

@@ -10 +10 @@
 // Created On       : Mon Jul 24 13:59:00 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Tue Jul 22 10:04:00 2020
-// Update Count     : 3
+// Last Modified On : Fri Jul 31 10:29:00 2020
+// Update Count     : 4
 //
 
@@ -18 +18 @@
 #include <cassert>                 // for assert, assertf
 #include <iterator>                // for back_inserter, inserter
-#include <map>                     // for map, _Rb_tree_iterator, map<>::ite...
 #include <string>                  // for string, allocator, operator==, ope...
-#include <utility>                 // for pair
 
 #include "Common/PassVisitor.h"    // for PassVisitor
+#include "Common/ScopedMap.h"      // for ScopedMap
 #include "Common/SemanticError.h"  // for SemanticError
 #include "SymTab/Mangler.h"        // for mangleType
@@ -37 +36 @@
         /// Maps virtual table types the instance for that type.
         class VirtualTableMap final {
-                std::unordered_map<std::string, ObjectDecl *> vtable_instances;
+                ScopedMap<std::string, ObjectDecl *> vtable_instances;
         public:
+                void enterScope() {
+                        vtable_instances.beginScope();
+                }
+                void leaveScope() {
+                        vtable_instances.endScope();
+                }
+
                 ObjectDecl * insert( ObjectDecl * vtableDecl ) {
                         std::string const & mangledName = SymTab::Mangler::mangleType( vtableDecl->type );
@@ -93 +99 @@
 
         class VirtualCastCore {
-                VirtualTableMap vtable_instances;
-                FunctionDecl *vcast_decl;
-                StructDecl *pvt_decl;
-
                 Type * pointer_to_pvt(int level_of_indirection) {
                         Type * type = new StructInstType(
@@ -108 +110 @@
         public:
                 VirtualCastCore() :
-                        vtable_instances(), vcast_decl( nullptr ), pvt_decl( nullptr )
+                        indexer(), vcast_decl( nullptr ), pvt_decl( nullptr )
                 {}
 
@@ -116 +118 @@
 
                 Expression * postmutate( VirtualCastExpr * castExpr );
+
+                VirtualTableMap indexer;
+        private:
+                FunctionDecl *vcast_decl;
+                StructDecl *pvt_decl;
         };
 
@@ -135 +142 @@
         void VirtualCastCore::premutate( ObjectDecl * objectDecl ) {
                 if ( is_vtable_inst_name( objectDecl->get_name() ) ) {
-                        if ( ObjectDecl * existing = vtable_instances.insert( objectDecl ) ) {
+                        if ( ObjectDecl * existing = indexer.insert( objectDecl ) ) {
                                 std::string msg = "Repeated instance of virtual table, original found at: ";
                                 msg += existing->location.filename;
@@ -222 +229 @@
 
                 const Type * vtable_type = getVirtualTableType( castExpr );
-                ObjectDecl * table = vtable_instances.lookup( vtable_type );
+                ObjectDecl * table = indexer.lookup( vtable_type );
                 if ( nullptr == table ) {
                         SemanticError( castLocation( castExpr ),