Changeset f678663 for src/ResolvExpr

Timestamp:

Jul 30, 2015, 4:08:34 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

8c84ebd, ae4c85a

Parents:

5aa708c (diff), 093f1a0 (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 /u/cforall/software/cfa/cfa-cc

Conflicts:

src/main.cc

Location:

src/ResolvExpr

Files:

• AlternativeFinder.cc (modified) (1 diff)
• Resolver.cc (modified) (3 diffs)

src/ResolvExpr/AlternativeFinder.cc

@@ -697 +697 @@
                         std::list< Type* >::iterator candidate_end = (*i).expr->get_results().begin();
                         std::advance( candidate_end, castExpr->get_results().size() );
-                        if ( ! unifyList( (*i).expr->get_results().begin(), candidate_end,
-                                                         castExpr->get_results().begin(), castExpr->get_results().end(), i->env, needAssertions, haveAssertions, openVars, indexer ) ) continue;
                         Cost thisCost = castCostList( (*i).expr->get_results().begin(), candidate_end,
                                                                                   castExpr->get_results().begin(), castExpr->get_results().end(), indexer, i->env );

src/ResolvExpr/Resolver.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 12:17:01 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jul 15 14:54:04 2015
-// Update Count     : 167
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Jul 24 17:33:54 2015
+// Update Count     : 178
 //
 
@@ -41 +41 @@
 
                 virtual void visit( ExprStmt *exprStmt );
+                virtual void visit( AsmExpr *asmExpr );
+                virtual void visit( AsmStmt *asmStmt );
                 virtual void visit( IfStmt *ifStmt );
                 virtual void visit( WhileStmt *whileStmt );
@@ -209 +211 @@
                         exprStmt->set_expr( newExpr );
                 } // if
+        }
+
+        void Resolver::visit( AsmExpr *asmExpr ) {
+                Expression *newExpr = findVoidExpression( asmExpr->get_operand(), *this );
+                delete asmExpr->get_operand();
+                asmExpr->set_operand( newExpr );
+                if ( asmExpr->get_inout() ) {
+                        newExpr = findVoidExpression( asmExpr->get_inout(), *this );
+                        delete asmExpr->get_inout();
+                        asmExpr->set_inout( newExpr );
+                } // if
+        }
+
+        void Resolver::visit( AsmStmt *asmStmt ) {
+                acceptAll( asmStmt->get_input(), *this);
+                acceptAll( asmStmt->get_output(), *this);
         }