Changeset b7b8674

Timestamp:

Feb 8, 2017, 5:04:20 PM (8 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:

aa9ee19

Parents:

52c14b3

Message:

make Tuples::maybeImpure slightly more precise

Location:

src

Files:

• InitTweak/FixInit.cc (modified) (1 diff)
• InitTweak/InitTweak.cc (modified) (1 diff)
• InitTweak/InitTweak.h (modified) (1 diff)
• Tuples/TupleExpansion.cc (modified) (2 diffs)

src/InitTweak/FixInit.cc

@@ -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/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.

src/Tuples/TupleExpansion.cc

@@ -29 +29 @@
 #include "ResolvExpr/typeops.h"
 #include "InitTweak/GenInit.h"
+#include "InitTweak/InitTweak.h"
 
 namespace Tuples {
@@ -337 +338 @@
                 public:
                         typedef Visitor Parent;
-                        virtual void visit( ApplicationExpr * appExpr ) { maybeImpure = true;   }
+                        virtual void visit( ApplicationExpr * appExpr ) {
+                                if ( DeclarationWithType * function = InitTweak::getFunction( appExpr ) ) {
+                                        if ( function->get_linkage() == LinkageSpec::Intrinsic ) {
+                                                if ( function->get_name() == "*?" || function->get_name() == "?[?]" ) {
+                                                        // intrinsic dereference, subscript are pure, but need to recursively look for impurity
+                                                        Parent::visit( appExpr );
+                                                        return;
+                                                }
+                                        }
+                                }
+                                maybeImpure = true;
+                        }
                         virtual void visit( UntypedExpr * untypedExpr ) { maybeImpure = true; }
                         bool maybeImpure = false;