Changeset ba54f7d for src/GenPoly

Timestamp:

Sep 13, 2017, 3:11:24 PM (8 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

Location:

src/GenPoly

Files:

• Box.cc (modified) (3 diffs)
• InstantiateGeneric.cc (modified) (1 diff)
• Lvalue.cc (modified) (1 diff)

src/GenPoly/Box.cc

@@ -15 +15 @@
 
 #include <algorithm>                     // for mismatch
-#include <cassert>                       // for assert, safe_dynamic_cast
+#include <cassert>                       // for assert, strict_dynamic_cast
 #include <iostream>                      // for operator<<, stringstream
 #include <list>                          // for list, list<>::iterator, _Lis...
@@ -1305 +1305 @@
 
                 DeclarationWithType * Pass2::mutate( FunctionDecl *functionDecl ) {
-                        functionDecl = safe_dynamic_cast< FunctionDecl * > ( handleDecl( functionDecl ) );
+                        functionDecl = strict_dynamic_cast< FunctionDecl * > ( handleDecl( functionDecl ) );
                         FunctionType * ftype = functionDecl->get_functionType();
                         if ( ! ftype->get_returnVals().empty() && functionDecl->get_statements() ) {
@@ -1384 +1384 @@
                         // move polymorphic return type to parameter list
                         if ( isDynRet( funcType ) ) {
-                                ObjectDecl *ret = safe_dynamic_cast< ObjectDecl* >( funcType->get_returnVals().front() );
+                                ObjectDecl *ret = strict_dynamic_cast< ObjectDecl* >( funcType->get_returnVals().front() );
                                 ret->set_type( new PointerType( Type::Qualifiers(), ret->get_type() ) );
                                 funcType->get_parameters().push_front( ret );

src/GenPoly/InstantiateGeneric.cc

@@ -459 +459 @@
                         Declaration * member = *std::next( aggr->members.begin(), memberIndex );
                         assertf( member->name == memberExpr->member->name, "Instantiation has different member order than the generic type. %s / %s", toString( member ).c_str(), toString( memberExpr->member ).c_str() );
-                        DeclarationWithType * field = safe_dynamic_cast< DeclarationWithType * >( member );
+                        DeclarationWithType * field = strict_dynamic_cast< DeclarationWithType * >( member );
                         MemberExpr * ret = new MemberExpr( field, memberExpr->aggregate->clone() );
                         std::swap( ret->env, memberExpr->env );

src/GenPoly/Lvalue.cc

@@ -14 +14 @@
 //
 
-#include <cassert>                       // for safe_dynamic_cast
+#include <cassert>                       // for strict_dynamic_cast
 #include <string>                        // for string