Changeset d3e4d6c for src/InitTweak/InitTweak.cc

Timestamp:

Aug 23, 2017, 6:22:07 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:

87e08e24, cb811ac

Parents:

9f07232 (diff), bd37119 (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/InitTweak.cc (modified) (4 diffs)

src/InitTweak/InitTweak.cc

@@ -187 +187 @@
 
                         UntypedExpr * increment = new UntypedExpr( new NameExpr( "++?" ) );
-                        increment->get_args().push_back( new AddressExpr( index->clone() ) );
+                        increment->get_args().push_back( index->clone() );
                         *out++ = new ExprStmt( noLabels, increment );
                 }
@@ -397 +397 @@
                 template<typename CallExpr>
                 Expression *& callArg( CallExpr * callExpr, unsigned int pos ) {
-                        if ( pos >= callExpr->get_args().size() ) assertf( false, "asking for argument that doesn't exist. Return NULL/throw exception?" );
+                        if ( pos >= callExpr->get_args().size() ) assertf( false, "getCallArg for argument that doesn't exist: (%u); %s.", pos, toString( callExpr ).c_str() );
                         for ( Expression *& arg : callExpr->get_args() ) {
                                 if ( pos == 0 ) return arg;
@@ -475 +475 @@
                 } else if ( ArrayType * arrayType = dynamic_cast< ArrayType * >( type ) ) {
                         return arrayType->get_base();
+                } else if ( ReferenceType * refType = dynamic_cast< ReferenceType * >( type ) ) {
+                        return refType->get_base();
                 } else {
                         return NULL;
@@ -560 +562 @@
                 if ( ftype->get_parameters().size() != 2 ) return 0;
 
-                Type * t1 = ftype->get_parameters().front()->get_type();
+                Type * t1 = getPointerBase( ftype->get_parameters().front()->get_type() );
                 Type * t2 = ftype->get_parameters().back()->get_type();
-                PointerType * ptrType = dynamic_cast< PointerType * > ( t1 );
-                assert( ptrType );
-
-                if ( ResolvExpr::typesCompatibleIgnoreQualifiers( ptrType->get_base(), t2, SymTab::Indexer() ) ) {
+                assert( t1 );
+
+                if ( ResolvExpr::typesCompatibleIgnoreQualifiers( t1, t2, SymTab::Indexer() ) ) {
                         return function;
                 } else {