Changeset a3f53d64 for src/SymTab

Timestamp:

Sep 24, 2020, 4:11:41 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

a9f0c65

Parents:

10d78f1 (diff), 6cc913e (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 into master

Location:

src/SymTab

Files:

• Mangler.cc (modified) (1 diff)
• Validate.cc (modified) (3 diffs)

src/SymTab/Mangler.cc

@@ -551 +551 @@
                         GuardValue( inFunctionType );
                         inFunctionType = true;
-                        std::vector< ast::ptr< ast::Type > > returnTypes = getTypes( functionType->returns );
-                        if (returnTypes.empty()) mangleName << Encoding::void_t;
-                        else accept_each( returnTypes, *visitor );
+                        if (functionType->returns.empty()) mangleName << Encoding::void_t;
+                        else accept_each( functionType->returns, *visitor );
                         mangleName << "_";
-                        std::vector< ast::ptr< ast::Type > > paramTypes = getTypes( functionType->params );
-                        accept_each( paramTypes, *visitor );
+                        accept_each( functionType->params, *visitor );
                         mangleName << "_";
                 }

src/SymTab/Validate.cc

@@ -1384 +1384 @@
         /// Replaces enum types by int, and function/array types in function parameter and return
         /// lists by appropriate pointers
+        /*
         struct EnumAndPointerDecay_new {
                 const ast::EnumDecl * previsit( const ast::EnumDecl * enumDecl ) {
@@ -1434 +1435 @@
                 }
         };
+        */
 
         /// expand assertions from a trait instance, performing appropriate type variable substitutions
@@ -1837 +1839 @@
 const ast::Type * validateType(
                 const CodeLocation & loc, const ast::Type * type, const ast::SymbolTable & symtab ) {
-        ast::Pass< EnumAndPointerDecay_new > epc;
+        // ast::Pass< EnumAndPointerDecay_new > epc;
         ast::Pass< LinkReferenceToTypes_new > lrt{ loc, symtab };
         ast::Pass< ForallPointerDecay_new > fpd{ loc };
 
-        return type->accept( epc )->accept( lrt )->accept( fpd );
+        return type->accept( lrt )->accept( fpd );
 }