Changeset ba54f7d for src/InitTweak/FixInit.cc

Timestamp:

Sep 13, 2017, 3:11:24 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

c57ded70, db70fe4

Parents:

d130fe8 (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 plg2:software/cfa/cfa-cc

File:

• src/InitTweak/FixInit.cc (modified) (9 diffs)

src/InitTweak/FixInit.cc

@@ -17 +17 @@
 #include <stddef.h>                    // for NULL
 #include <algorithm>                   // for set_difference, copy_if
-#include <cassert>                     // for assert, safe_dynamic_cast
+#include <cassert>                     // for assert, strict_dynamic_cast
 #include <iostream>                    // for operator<<, ostream, basic_ost...
 #include <iterator>                    // for insert_iterator, back_inserter
@@ -424 +424 @@
                         // arrays are not copy constructed, so this should always be an ExprStmt
                         ImplicitCtorDtorStmt * stmt = genCtorDtor( fname, var, cpArg );
-                        ExprStmt * exprStmt = safe_dynamic_cast< ExprStmt * >( stmt->get_callStmt() );
+                        ExprStmt * exprStmt = strict_dynamic_cast< ExprStmt * >( stmt->get_callStmt() );
                         Expression * untyped = exprStmt->get_expr();
 
@@ -532 +532 @@
                                 assert( ! body->get_kids().empty() );
                                 // must be an ExprStmt, otherwise it wouldn't have a result
-                                ExprStmt * last = safe_dynamic_cast< ExprStmt * >( body->get_kids().back() );
+                                ExprStmt * last = strict_dynamic_cast< ExprStmt * >( body->get_kids().back() );
                                 last->set_expr( makeCtorDtor( "?{}", ret, last->get_expr() ) );
 
@@ -566 +566 @@
                         CP_CTOR_PRINT( std::cerr << "FixCopyCtors: " << impCpCtorExpr << std::endl; )
 
-                        impCpCtorExpr = safe_dynamic_cast< ImplicitCopyCtorExpr * >( Parent::mutate( impCpCtorExpr ) );
+                        impCpCtorExpr = strict_dynamic_cast< ImplicitCopyCtorExpr * >( Parent::mutate( impCpCtorExpr ) );
                         std::list< ObjectDecl * > & tempDecls = impCpCtorExpr->get_tempDecls();
                         std::list< ObjectDecl * > & returnDecls = impCpCtorExpr->get_returnDecls();
@@ -627 +627 @@
                                 stmt = stmt->acceptMutator( *this );
                         } // for
-                        // stmtExpr = safe_dynamic_cast< StmtExpr * >( Parent::mutate( stmtExpr ) );
+                        // stmtExpr = strict_dynamic_cast< StmtExpr * >( Parent::mutate( stmtExpr ) );
                         assert( stmtExpr->get_result() );
                         Type * result = stmtExpr->get_result();
@@ -791 +791 @@
                                                 }
                                         } else {
-                                                ImplicitCtorDtorStmt * implicit = safe_dynamic_cast< ImplicitCtorDtorStmt * > ( ctor );
+                                                ImplicitCtorDtorStmt * implicit = strict_dynamic_cast< ImplicitCtorDtorStmt * > ( ctor );
                                                 ExprStmt * ctorStmt = dynamic_cast< ExprStmt * >( implicit->get_callStmt() );
                                                 ApplicationExpr * ctorCall = nullptr;
@@ -996 +996 @@
                                 FunctionType * type = function->get_functionType();
                                 assert( ! type->get_parameters().empty() );
-                                thisParam = safe_dynamic_cast< ObjectDecl * >( type->get_parameters().front() );
+                                thisParam = strict_dynamic_cast< ObjectDecl * >( type->get_parameters().front() );
                                 Type * thisType = getPointerBase( thisParam->get_type() );
                                 StructInstType * structType = dynamic_cast< StructInstType * >( thisType );
@@ -1166 +1166 @@
 
                 Expression* MutatingResolver::mutate( UntypedExpr *untypedExpr ) {
-                        return safe_dynamic_cast< ApplicationExpr * >( ResolvExpr::findVoidExpression( untypedExpr, indexer ) );
+                        return strict_dynamic_cast< ApplicationExpr * >( ResolvExpr::findVoidExpression( untypedExpr, indexer ) );
                 }
 
@@ -1179 +1179 @@
 
                         // xxx - this can be TupleAssignExpr now. Need to properly handle this case.
-                        ApplicationExpr * callExpr = safe_dynamic_cast< ApplicationExpr * > ( ctorExpr->get_callExpr() );
+                        ApplicationExpr * callExpr = strict_dynamic_cast< ApplicationExpr * > ( ctorExpr->get_callExpr() );
                         TypeSubstitution * env = ctorExpr->get_env();
                         ctorExpr->set_callExpr( nullptr );