Changeset c935c3a for src/ResolvExpr/Resolver.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/Resolver.cc (modified) (5 diffs)

src/ResolvExpr/Resolver.cc

@@ -15 +15 @@
 
 #include <stddef.h>                      // for NULL
-#include <cassert>                       // for safe_dynamic_cast, assert
+#include <cassert>                       // for strict_dynamic_cast, assert
 #include <memory>                        // for allocator, allocator_traits<...
 #include <tuple>                         // for get
@@ -342 +342 @@
                         CastExpr * castExpr = new CastExpr( caseStmt->get_condition(), initAlts.front().type->clone() );
                         Expression * newExpr = findSingleExpression( castExpr, *this );
-                        castExpr = safe_dynamic_cast< CastExpr * >( newExpr );
+                        castExpr = strict_dynamic_cast< CastExpr * >( newExpr );
                         caseStmt->set_condition( castExpr->get_arg() );
                         castExpr->set_arg( nullptr );
@@ -398 +398 @@
                 Parent::enterScope();
                 Visitor::visit( catchStmt );
-                
+
                 if ( catchStmt->get_cond() ) {
                         Expression * wrapped = new CastExpr(
@@ -423 +423 @@
                 UntypedInitExpr * untyped = new UntypedInitExpr( singleInit->get_value(), currentObject.getOptions() );
                 Expression * newExpr = findSingleExpression( untyped, *this );
-                InitExpr * initExpr = safe_dynamic_cast< InitExpr * >( newExpr );
+                InitExpr * initExpr = strict_dynamic_cast< InitExpr * >( newExpr );
 
                 // move cursor to the object that is actually initialized
@@ -445 +445 @@
                                         if ( isCharType( pt->get_base() ) ) {
                                                 // strip cast if we're initializing a char[] with a char *, e.g.  char x[] = "hello";
-                                                CastExpr *ce = safe_dynamic_cast< CastExpr * >( newExpr );
+                                                CastExpr *ce = strict_dynamic_cast< CastExpr * >( newExpr );
                                                 newExpr = ce->get_arg();
                                                 ce->set_arg( nullptr );