Changeset 353d168 for src/ResolvExpr

Timestamp:

Aug 19, 2015, 3:59:45 PM (11 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, stuck-waitfor-destruct, with_gc

Children:

830c21a

Parents:

18997b9 (diff), 4aa0858 (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 'override-autogen' into ctor

Conflicts:

src/Parser/ParseNode.h

Location:

src/ResolvExpr

Files:

• AlternativeFinder.cc (modified) (2 diffs)
• CastCost.cc (modified) (3 diffs)
• CommonType.cc (modified) (1 diff)
• Cost.h (modified) (2 diffs)
• Resolver.cc (modified) (3 diffs)
• typeops.h (modified) (1 diff)

src/ResolvExpr/AlternativeFinder.cc

@@ -343 +343 @@
         }
 
+        /// Adds type variables to the open variable set and marks their assertions
         void makeUnifiableVars( Type *type, OpenVarSet &unifiableVars, AssertionSet &needAssertions ) {
                 for ( std::list< TypeDecl* >::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) {
@@ -697 +698 @@
                         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/CastCost.cc

@@ -66 +66 @@
 
         void CastCost::visit( BasicType *basicType ) {
-                if ( dynamic_cast< PointerType* >( dest ) ) {
+                PointerType *destAsPointer = dynamic_cast< PointerType* >( dest );
+                if ( destAsPointer && basicType->isInteger() ) {
                         cost = Cost( 1, 0, 0 );
                 } else {
@@ -77 +78 @@
                         if ( pointerType->get_qualifiers() <= destAsPtr->get_qualifiers() && typesCompatibleIgnoreQualifiers( pointerType->get_base(), destAsPtr->get_base(), indexer, env ) ) {
                                 cost = Cost( 0, 0, 1 );
-                        } else if ( BasicType *destAsBasic = dynamic_cast< BasicType* >( dest ) ) {
-                                if ( destAsBasic->isInteger() ) {
-                                        cost = Cost( 1, 0, 0 );
-                                } // if
                         } else {
                                 TypeEnvironment newEnv( env );
@@ -92 +89 @@
                                 } // if
                         } // if
-                } // if
+                } else if ( BasicType *destAsBasic = dynamic_cast< BasicType* >( dest ) ) {
+                        if ( destAsBasic->isInteger() ) {
+                                cost = Cost( 1, 0, 0 );
+                        } // if
+                }
         }
 } // namespace ResolvExpr

src/ResolvExpr/CommonType.cc

@@ -138 +138 @@
         void CommonType::visit( PointerType *pointerType ) {
                 if ( PointerType *otherPointer = dynamic_cast< PointerType* >( type2 ) ) {
-                        if ( widenFirst && dynamic_cast< VoidType* >( otherPointer->get_base() ) ) {
+                        if ( widenFirst && dynamic_cast< VoidType* >( otherPointer->get_base() ) && ! isFtype(pointerType->get_base(), indexer) ) {
                                 result = otherPointer->clone();
                                 result->get_qualifiers() += pointerType->get_qualifiers();
-                        } else if ( widenSecond && dynamic_cast< VoidType* >( pointerType->get_base() ) ) {
+                        } else if ( widenSecond && dynamic_cast< VoidType* >( pointerType->get_base() ) && ! isFtype(otherPointer->get_base(), indexer) ) {
                                 result = pointerType->clone();
                                 result->get_qualifiers() += otherPointer->get_qualifiers();

src/ResolvExpr/Cost.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 09:39:50 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May 17 09:42:04 2015
-// Update Count     : 3
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Jul 22 16:43:10 2015
+// Update Count     : 4
 //
 
@@ -56 +56 @@
 
         inline void Cost::incPoly( int inc ) {
-                unsafe += inc;
+                poly += inc;
         }
 
         inline void Cost::incSafe( int inc ) {
-                unsafe += inc;
+                safe += inc;
         }
 

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);
         }
 

src/ResolvExpr/typeops.h

@@ -117 +117 @@
 
         // in Unify.cc
+        bool isFtype( Type *type, const SymTab::Indexer &indexer );
         bool typesCompatible( Type *, Type *, const SymTab::Indexer &indexer, const TypeEnvironment &env );
         bool typesCompatibleIgnoreQualifiers( Type *, Type *, const SymTab::Indexer &indexer, const TypeEnvironment &env );