Changeset 9dbf7c8

Timestamp:

Oct 19, 2017, 11:15:36 AM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

aabc60c

Parents:

582ee28

git-author:

Rob Schluntz <rschlunt@…> (10/17/17 12:55:58)

git-committer:

Rob Schluntz <rschlunt@…> (10/19/17 11:15:36)

Message:

Modify CopyParams? to use DWT pointers rather than unique ids

Location:

src

Files:

• GenPoly/CopyParams.cc (modified) (3 diffs)
• main.cc (modified) (1 diff)

src/GenPoly/CopyParams.cc

@@ -40 +40 @@
 
           private:
-                std::set< UniqueId > modVars;
+                std::set< DeclarationWithType * > modVars;
                 UniqueName namer;
         };
@@ -68 +68 @@
                                 } // for
                                 for ( std::list< DeclarationWithType* >::iterator param = funcDecl->type->parameters.begin(); param != funcDecl->type->parameters.end(); ++param ) {
-                                        std::set< UniqueId >::const_iterator var = modVars.find( (*param)->get_uniqueId() );
+                                        std::set< DeclarationWithType * >::const_iterator var = modVars.find( *param );
                                         if ( var != modVars.end() ) {
                                                 TypeInstType *typeInst = dynamic_cast< TypeInstType* >( (*param)->get_type() );
-                                                assertf( typeInst, "Found in modVars for function %s: unique id: %u, %s", funcDecl->name.c_str(), (*param)->get_uniqueId(), toString( *param ).c_str() );
                                                 std::map< std::string, DeclarationWithType* >::const_iterator assignOp = assignOps.find( typeInst->name );
                                                 if ( assignOp != assignOps.end() ) {
@@ -99 +98 @@
                 if ( VariableExpr *varExpr = dynamic_cast< VariableExpr* >( addrExpr->arg ) ) {
                         if ( dynamic_cast< TypeInstType* >( varExpr->var->get_type() ) ) {
-                                assertf( varExpr->var->get_uniqueId(), "Address-taken variable does not have a unique ID: %s", toString( varExpr->var ).c_str() );
-                                modVars.insert( varExpr->var->get_uniqueId() );
-                                std::cerr << "added unique id: " << varExpr->var->get_uniqueId() << " var: " << varExpr->var << std::endl;
+                                modVars.insert( varExpr->var );
                         } // if
                 } // if

src/main.cc

@@ -321 +321 @@
                 OPTPRINT("instantiateGenerics")
                 GenPoly::instantiateGeneric( translationUnit );
+                OPTPRINT( "convertLvalue" )
+                GenPoly::convertLvalue( translationUnit );
                 OPTPRINT( "copyParams" );
                 GenPoly::copyParams( translationUnit );
-                OPTPRINT( "convertLvalue" )
-                GenPoly::convertLvalue( translationUnit );
 
                 if ( bboxp ) {