Changeset eb8d791

Timestamp:

Apr 12, 2023, 3:10:28 PM (20 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master

Children:

52f9804

Parents:

153d3440

Message:

CandidateFinder? fills in the CodeLocation? on a generated expression. With that and recent changes, the fills seem to be redundent now, so I removed them.

Location:

src

Files:

• InitTweak/FixInitNew.cpp (modified) (1 diff)
• ResolvExpr/CandidateFinder.cpp (modified) (10 diffs)
• ResolvExpr/ExplodedArg.hpp (modified) (1 diff)
• main.cc (modified) (3 diffs)

src/InitTweak/FixInitNew.cpp

@@ -1312 +1312 @@
                 // xxx - functions returning ast::ptr seems wrong...
                 auto res = ResolvExpr::findVoidExpression( untypedExpr, { symtab, transUnit().global } );
-                // Fix CodeLocation (at least until resolver is fixed).
-                auto fix = localFillCodeLocations( untypedExpr->location, res.release() );
-                return strict_dynamic_cast<const ast::Expr *>( fix );
+                return res.release();
         }
 

src/ResolvExpr/CandidateFinder.cpp

@@ -279 +279 @@
         /// Instantiates an argument to match a parameter, returns false if no matching results left
         bool instantiateArgument(
+                const CodeLocation & location,
                 const ast::Type * paramType, const ast::Init * init, const ExplodedArgs_new & args,
                 std::vector< ArgPack > & results, std::size_t & genStart, const ast::SymbolTable & symtab,
@@ -289 +290 @@
                                 // xxx - dropping initializer changes behaviour from previous, but seems correct
                                 // ^^^ need to handle the case where a tuple has a default argument
-                                if ( ! instantiateArgument(
+                                if ( ! instantiateArgument( location,
                                         type, nullptr, args, results, genStart, symtab, nTuples ) ) return false;
                                 nTuples = 0;
@@ -341 +342 @@
                                                         // push empty tuple expression
                                                         newResult.parent = i;
-                                                        newResult.expr = new ast::TupleExpr{ CodeLocation{}, {} };
+                                                        newResult.expr = new ast::TupleExpr( location, {} );
                                                         argType = newResult.expr->result;
                                                 } else {
@@ -614 +615 @@
                 /// Builds a list of candidates for a function, storing them in out
                 void makeFunctionCandidates(
+                        const CodeLocation & location,
                         const CandidateRef & func, const ast::FunctionType * funcType,
                         const ExplodedArgs_new & args, CandidateList & out );
@@ -732 +734 @@
         /// Builds a list of candidates for a function, storing them in out
         void Finder::makeFunctionCandidates(
+                const CodeLocation & location,
                 const CandidateRef & func, const ast::FunctionType * funcType,
                 const ExplodedArgs_new & args, CandidateList & out
@@ -768 +771 @@
                                 for (size_t i=0; i<nParams; ++i) {
                                         auto obj = funcDecl->params[i].strict_as<ast::ObjectDecl>();
-                                        if (!instantiateArgument(
+                                        if (!instantiateArgument( location,
                                                 funcType->params[i], obj->init, args, results, genStart, symtab)) return;
                                 }
@@ -778 +781 @@
                         // matches
                         // no default args for indirect calls
-                        if ( ! instantiateArgument(
+                        if ( ! instantiateArgument( location,
                                 param, nullptr, args, results, genStart, symtab ) ) return;
                 }
@@ -1007 +1010 @@
                                                 newFunc->expr =
                                                         referenceToRvalueConversion( newFunc->expr, newFunc->cost );
-                                                makeFunctionCandidates( newFunc, function, argExpansions, found );
+                                                makeFunctionCandidates( untypedExpr->location,
+                                                        newFunc, function, argExpansions, found );
                                         }
                                 } else if (
@@ -1017 +1021 @@
                                                         newFunc->expr =
                                                                 referenceToRvalueConversion( newFunc->expr, newFunc->cost );
-                                                        makeFunctionCandidates( newFunc, function, argExpansions, found );
+                                                        makeFunctionCandidates( untypedExpr->location,
+                                                                newFunc, function, argExpansions, found );
                                                 }
                                         }
@@ -1043 +1048 @@
                                                         newOp->expr =
                                                                 referenceToRvalueConversion( newOp->expr, newOp->cost );
-                                                        makeFunctionCandidates( newOp, function, argExpansions, found );
+                                                        makeFunctionCandidates( untypedExpr->location,
+                                                                newOp, function, argExpansions, found );
                                                 }
                                         }

src/ResolvExpr/ExplodedArg.hpp

@@ -35 +35 @@
         ExplodedArg() : env(), cost( Cost::zero ), exprs() {}
         ExplodedArg( const Candidate & arg, const ast::SymbolTable & symtab );
-        
+
         ExplodedArg( ExplodedArg && ) = default;
         ExplodedArg & operator= ( ExplodedArg && ) = default;

src/main.cc

@@ -310 +310 @@
 
                 PASS( "Hoist Type Decls", Validate::hoistTypeDecls( transUnit ) );
-                // Hoist Type Decls pulls some declarations out of contexts where
-                // locations are not tracked. Perhaps they should be, but for now
-                // the full fill solves it.
-                forceFillCodeLocations( transUnit );
 
                 PASS( "Translate Exception Declarations", ControlStruct::translateExcept( transUnit ) );
@@ -343 +339 @@
                 PASS( "Implement Actors", Concurrency::implementActors( transUnit ) );
         PASS( "Implement Virtual Destructors", Virtual::implementVirtDtors(transUnit) );
-        
                 PASS( "Implement Mutex", Concurrency::implementMutex( transUnit ) );
                 PASS( "Implement Thread Start", Concurrency::implementThreadStarter( transUnit ) );
@@ -396 +391 @@
                         return EXIT_SUCCESS;
                 } // if
-
-                forceFillCodeLocations( transUnit );
 
                 PASS( "Fix Init", InitTweak::fix(transUnit, buildingLibrary()));