Changeset 54dd994 for src/ResolvExpr/CandidateFinder.cpp

Timestamp:

Jun 24, 2019, 10:30:47 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

84917e2

Parents:

3c6e417 (diff), 9e0a360 (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 plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/ResolvExpr/CandidateFinder.cpp (modified) (5 diffs)

src/ResolvExpr/CandidateFinder.cpp

@@ -39 +39 @@
 #include "AST/SymbolTable.hpp"
 #include "AST/Type.hpp"
+#include "Common/utility.h"       // for move, copy
 #include "SymTab/Mangler.h"
 #include "SymTab/Validate.h"      // for validateType
@@ -46 +47 @@
 
 namespace ResolvExpr {
-
-using std::move;
-
-/// partner to move that copies any copyable type
-template<typename T>
-T copy( const T & x ) { return x; }
 
 const ast::Expr * referenceToRvalueConversion( const ast::Expr * expr, Cost & cost ) {
@@ -57 +52 @@
                 // cast away reference from expr
                 cost.incReference();
-                return new ast::CastExpr{ expr->location, expr, expr->result->stripReferences() };
+                return new ast::CastExpr{ expr, expr->result->stripReferences() };
         }
         
@@ -126 +121 @@
                         ast::ptr< ast::Type > newType = paramType;
                         env.apply( newType );
-                        return new ast::CastExpr{ arg->location, arg, newType };
+                        return new ast::CastExpr{ arg, newType };
 
                         // xxx - *should* be able to resolve this cast, but at the moment pointers are not 
@@ -793 +788 @@
                         
                         if ( aggrType.as< ast::ReferenceType >() ) {
-                                aggrExpr = 
-                                        new ast::CastExpr{ aggrExpr->location, aggrExpr, aggrType->stripReferences() };
+                                aggrExpr = new ast::CastExpr{ aggrExpr, aggrType->stripReferences() };
                         }