Changeset c935c3a for src/ResolvExpr/AlternativeFinder.cc

Timestamp:

Sep 13, 2017, 3:03:32 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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, resolv-new, with_gc

Children:

ed235b6

Parents:

b2e2e34 (diff), 982832e (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/AlternativeFinder.cc (modified) (4 diffs)

src/ResolvExpr/AlternativeFinder.cc

@@ -15 +15 @@
 
 #include <algorithm>               // for copy
-#include <cassert>                 // for safe_dynamic_cast, assert, assertf
+#include <cassert>                 // for strict_dynamic_cast, assert, assertf
 #include <iostream>                // for operator<<, cerr, ostream, endl
 #include <iterator>                // for back_insert_iterator, back_inserter
@@ -336 +336 @@
 
         Cost computeApplicationConversionCost( Alternative &alt, const SymTab::Indexer &indexer ) {
-                ApplicationExpr *appExpr = safe_dynamic_cast< ApplicationExpr* >( alt.expr );
-                PointerType *pointer = safe_dynamic_cast< PointerType* >( appExpr->get_function()->get_result() );
-                FunctionType *function = safe_dynamic_cast< FunctionType* >( pointer->get_base() );
+                ApplicationExpr *appExpr = strict_dynamic_cast< ApplicationExpr* >( alt.expr );
+                PointerType *pointer = strict_dynamic_cast< PointerType* >( appExpr->get_function()->get_result() );
+                FunctionType *function = strict_dynamic_cast< FunctionType* >( pointer->get_base() );
 
                 Cost convCost = Cost::zero;
@@ -494 +494 @@
                         Cost cost = Cost::zero;
                         std::list< Expression * > newExprs;
-                        ObjectDecl * obj = safe_dynamic_cast< ObjectDecl * >( formal );
+                        ObjectDecl * obj = strict_dynamic_cast< ObjectDecl * >( formal );
                         if ( ! instantiateArgument( obj->get_type(), obj->get_init(), actualExpr, actualEnd, openVars, resultEnv, resultNeed, resultHave, indexer, cost, back_inserter( newExprs ) ) ) {
                                 deleteAll( newExprs );
@@ -787 +787 @@
 
                         PRINT(
-                                ApplicationExpr *appExpr = safe_dynamic_cast< ApplicationExpr* >( withFunc->expr );
-                                PointerType *pointer = safe_dynamic_cast< PointerType* >( appExpr->get_function()->get_result() );
-                                FunctionType *function = safe_dynamic_cast< FunctionType* >( pointer->get_base() );
+                                ApplicationExpr *appExpr = strict_dynamic_cast< ApplicationExpr* >( withFunc->expr );
+                                PointerType *pointer = strict_dynamic_cast< PointerType* >( appExpr->get_function()->get_result() );
+                                FunctionType *function = strict_dynamic_cast< FunctionType* >( pointer->get_base() );
                                 std::cerr << "Case +++++++++++++ " << appExpr->get_function() << std::endl;
                                 std::cerr << "formals are:" << std::endl;