Changeset 630bcb5 for src

Timestamp:

Jun 6, 2018, 4:54:18 PM (6 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, with_gc

Children:

2a6c115

Parents:

214e8da

Message:

Fix pruneAlternatives so that deleted expressions are no longer ambiguous

Location:

src/ResolvExpr

Files:

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

src/ResolvExpr/AlternativeFinder.cc

@@ -176 +176 @@
                                                 selected[ mangleName ] = current;
                                         } else if ( candidate->cost == mapPlace->second.candidate->cost ) {
-                                                PRINT(
-                                                        std::cerr << "marking ambiguous" << std::endl;
-                                                )
-                                                mapPlace->second.isAmbiguous = true;
+                                                // if one of the candidates contains a deleted identifier, can pick the other, since
+                                                // deleted expressions should not be ambiguous if there is another option that is at least as good
+                                                if ( findDeletedExpr( candidate->expr ) ) {
+                                                        // do nothing
+                                                        PRINT( std::cerr << "candidate is deleted" << std::endl; )
+                                                } else if ( findDeletedExpr( mapPlace->second.candidate->expr ) ) {
+                                                        PRINT( std::cerr << "current is deleted" << std::endl; )
+                                                        selected[ mangleName ] = current;
+                                                } else {
+                                                        PRINT(
+                                                                std::cerr << "marking ambiguous" << std::endl;
+                                                        )
+                                                        mapPlace->second.isAmbiguous = true;
+                                                }
                                         } else {
                                                 PRINT(
@@ -611 +621 @@
         ConstantExpr* getDefaultValue( Initializer* init ) {
                 if ( SingleInit* si = dynamic_cast<SingleInit*>( init ) ) {
-                        if ( CastExpr* ce = dynamic_cast<CastExpr*>( si->get_value() ) ) {
-                                return dynamic_cast<ConstantExpr*>( ce->get_arg() );
+                        if ( CastExpr* ce = dynamic_cast<CastExpr*>( si->value ) ) {
+                                return dynamic_cast<ConstantExpr*>( ce->arg );
+                        } else {
+                                return dynamic_cast<ConstantExpr*>( si->value );
                         }
                 }
@@ -1065 +1077 @@
                 funcFinder.findWithAdjustment( untypedExpr->function );
                 // if there are no function alternatives, then proceeding is a waste of time.
+                // xxx - findWithAdjustment throws, so this check and others like it shouldn't be necessary.
                 if ( funcFinder.alternatives.empty() ) return;
 

src/ResolvExpr/Resolver.h

@@ -36 +36 @@
         void resolveCtorInit( ConstructorInit * ctorInit, const SymTab::Indexer & indexer );
         void resolveStmtExpr( StmtExpr * stmtExpr, const SymTab::Indexer & indexer );
+        /// Searches expr and returns the first DeletedExpr found, otherwise nullptr
+        DeletedExpr * findDeletedExpr( Expression * expr );
 } // namespace ResolvExpr