Changeset be151bf

Timestamp:

Oct 19, 2017, 11:13:12 AM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

a117f7c

Parents:

21ea170

git-author:

Rob Schluntz <rschlunt@…> (10/12/17 15:53:05)

git-committer:

Rob Schluntz <rschlunt@…> (10/19/17 11:13:12)

Message:

Minor cleanup in InsertImplicitCalls? and augment assert in strict_dynamic_cast

Location:

src

Files:

• InitTweak/FixInit.cc (modified) (2 diffs)
• include/cassert (modified) (1 diff)

src/InitTweak/FixInit.cc

@@ -323 +323 @@
 
                 Expression * InsertImplicitCalls::postmutate( ApplicationExpr * appExpr ) {
-                        assert( appExpr );
-
                         if ( VariableExpr * function = dynamic_cast< VariableExpr * > ( appExpr->get_function() ) ) {
-                                if ( LinkageSpec::isBuiltin( function->get_var()->get_linkage() ) ) {
+                                if ( function->var->linkage.is_builtin ) {
                                         // optimization: don't need to copy construct in order to call intrinsic functions
                                         return appExpr;
@@ -332 +330 @@
                                         FunctionType * ftype = dynamic_cast< FunctionType * >( GenPoly::getFunctionType( funcDecl->get_type() ) );
                                         assertf( ftype, "Function call without function type: %s", toString( funcDecl ).c_str() );
-                                        if ( CodeGen::isConstructor( funcDecl->get_name() ) && ftype->get_parameters().size() == 2 ) {
-                                                Type * t1 = getPointerBase( ftype->get_parameters().front()->get_type() );
-                                                Type * t2 = ftype->get_parameters().back()->get_type();
+                                        if ( CodeGen::isConstructor( funcDecl->get_name() ) && ftype->parameters.size() == 2 ) {
+                                                Type * t1 = getPointerBase( ftype->parameters.front()->get_type() );
+                                                Type * t2 = ftype->parameters.back()->get_type();
                                                 assert( t1 );
 

src/include/cassert

@@ -41 +41 @@
 static inline T strict_dynamic_cast( const U & src ) {
         T ret = dynamic_cast<T>(src);
-        assert(ret);
+        assertf(ret, "%s", toString(src).c_str());
         return ret;
 }