Changeset 396ee0a for src/InitTweak

Timestamp:

Feb 22, 2017, 2:42:11 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

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, stuck-waitfor-destruct, with_gc

Children:

131dbb3, 692de479

Parents:

0788b739 (diff), fc39193 (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

Location:

src/InitTweak

Files:

• FixInit.cc (modified) (4 diffs)
• GenInit.cc (modified) (2 diffs)
• InitTweak.cc (modified) (1 diff)
• InitTweak.h (modified) (1 diff)

src/InitTweak/FixInit.cc

@@ -10 +10 @@
 // Created On       : Wed Jan 13 16:29:30 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 12 17:41:15 2016
-// Update Count     : 34
+// Last Modified On : Thu Feb 16 14:58:43 2017
+// Update Count     : 35
 //
 
@@ -313 +313 @@
                                         translationUnit.splice( i, fixer.staticDtorDecls );
                                 } catch( SemanticError &e ) {
+                                        e.set_location( (*i)->location );
                                         errors.append( e );
                                 } // try
@@ -838 +839 @@
                 void handleFuncDecl( FunctionDecl * funcDecl, Visitor & visitor ) {
                         maybeAccept( funcDecl->get_functionType(), visitor );
-                        acceptAll( funcDecl->get_oldDecls(), visitor );
                         maybeAccept( funcDecl->get_statements(), visitor );
                 }
@@ -1116 +1116 @@
                         // xxx - is the size check necessary?
                         assert( ctorExpr->has_result() && ctorExpr->get_result()->size() == 1 );
+
+                        // xxx - ideally we would reuse the temporary generated from the copy constructor passes from within firstArg if it exists and not generate a temporary if it's unnecessary.
                         ObjectDecl * tmp = new ObjectDecl( tempNamer.newName(), DeclarationNode::NoStorageClass, LinkageSpec::C, nullptr, ctorExpr->get_result()->clone(), nullptr );
                         addDeclaration( tmp );

src/InitTweak/GenInit.cc

@@ -9 +9 @@
 // Author           : Rob Schluntz
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Fri May 13 11:37:48 2016
-// Update Count     : 166
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Feb 16 14:57:53 2017
+// Update Count     : 167
 //
 
@@ -320 +320 @@
                 }
                 // parameters should not be constructed and destructed, so don't mutate FunctionType
-                mutateAll( functionDecl->get_oldDecls(), *this );
                 functionDecl->set_statements( maybeMutate( functionDecl->get_statements(), *this ) );
 

src/InitTweak/InitTweak.cc

@@ -332 +332 @@
                         return nullptr;
                 }
+        }
+
+        DeclarationWithType * getFunction( Expression * expr ) {
+                if ( ApplicationExpr * appExpr = dynamic_cast< ApplicationExpr * >( expr ) ) {
+                        return getCalledFunction( appExpr->get_function() );
+                } else if ( UntypedExpr * untyped = dynamic_cast< UntypedExpr * > ( expr ) ) {
+                        return getCalledFunction( untyped->get_function() );
+                }
+                assertf( false, "getFunction received unknown expression: %s", toString( expr ).c_str() );
         }
 

src/InitTweak/InitTweak.h

@@ -51 +51 @@
         bool checkInitDepth( ObjectDecl * objDecl );
 
-  /// Non-Null if expr is a call expression whose target function is intrinsic
-  ApplicationExpr * isIntrinsicCallExpr( Expression * expr );
+        /// returns the declaration of the function called by the expr (must be ApplicationExpr or UntypedExpr)
+        DeclarationWithType * getFunction( Expression * expr );
+
+        /// Non-Null if expr is a call expression whose target function is intrinsic
+        ApplicationExpr * isIntrinsicCallExpr( Expression * expr );
 
         /// True if stmt is a call statement where the function called is intrinsic and takes one parameter.