Changeset aedfd91

Timestamp:

Jul 25, 2016, 4:20:17 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

29e8bf5

Parents:

72e9222

Message:

unused thunks are no longer generated for intrinsic function calls

Location:

src

Files:

• GenPoly/Specialize.cc (modified) (2 diffs)
• InitTweak/InitTweak.cc (modified) (1 diff)
• InitTweak/InitTweak.h (modified) (1 diff)

src/GenPoly/Specialize.cc

@@ -31 +31 @@
 #include "Common/UniqueName.h"
 #include "Common/utility.h"
+#include "InitTweak/InitTweak.h"
 
 namespace GenPoly {
@@ -184 +185 @@
                 mutateAll( appExpr->get_args(), *this );
 
-                // create thunks for the inferred parameters
-                for ( InferredParams::iterator inferParam = appExpr->get_inferParams().begin(); inferParam != appExpr->get_inferParams().end(); ++inferParam ) {
-                        inferParam->second.expr = doSpecialization( inferParam->second.formalType, inferParam->second.expr, &appExpr->get_inferParams() );
-                }
-
-                handleExplicitParams( appExpr );
+                if ( ! InitTweak::isIntrinsicCallExpr( appExpr ) ) {
+                        // create thunks for the inferred parameters
+                        // don't need to do this for intrinsic calls, because they aren't actually passed
+                        for ( InferredParams::iterator inferParam = appExpr->get_inferParams().begin(); inferParam != appExpr->get_inferParams().end(); ++inferParam ) {
+                                inferParam->second.expr = doSpecialization( inferParam->second.formalType, inferParam->second.expr, &appExpr->get_inferParams() );
+                        }
+
+                        handleExplicitParams( appExpr );
+                }
 
                 return appExpr;

src/InitTweak/InitTweak.cc

@@ -85 +85 @@
                 }
         }
+        namespace {
+                VariableExpr * getCalledFunction( ApplicationExpr * appExpr ) {
+                        assert( appExpr );
+                        return dynamic_cast< VariableExpr * >( appExpr->get_function() );
+                }
+        }
+
+        ApplicationExpr * isIntrinsicCallExpr( Expression * expr ) {
+                ApplicationExpr * appExpr = dynamic_cast< ApplicationExpr * >( expr );
+                if ( ! appExpr ) return NULL;
+                VariableExpr * function = getCalledFunction( appExpr );
+                assert( function );
+                // check for Intrinsic only - don't want to remove all overridable ctor/dtors because autogenerated ctor/dtor
+                // will call all member dtors, and some members may have a user defined dtor.
+                return function->get_var()->get_linkage() == LinkageSpec::Intrinsic ? appExpr : NULL;
+        }
 
         bool isInstrinsicSingleArgCallStmt( Statement * stmt ) {
                 Expression * callExpr = getCtorDtorCall( stmt );
                 if ( ! callExpr ) return false;
-                ApplicationExpr * appExpr = dynamic_cast< ApplicationExpr * >( callExpr );
-                assert( appExpr );
-                VariableExpr * function = dynamic_cast< VariableExpr * >( appExpr->get_function() );
-                assert( function );
-                // check for Intrinsic only - don't want to remove all overridable ctor/dtors because autogenerated ctor/dtor
-                // will call all member dtors, and some members may have a user defined dtor.
-                FunctionType * funcType = GenPoly::getFunctionType( function->get_var()->get_type() );
-                assert( funcType );
-                return function->get_var()->get_linkage() == LinkageSpec::Intrinsic && funcType->get_parameters().size() == 1;
+                if ( ApplicationExpr * appExpr = isIntrinsicCallExpr( callExpr ) ) {
+                        assert( ! appExpr->get_function()->get_results().empty() );
+                        FunctionType *funcType = GenPoly::getFunctionType( appExpr->get_function()->get_results().front() );
+                        assert( funcType );
+                        return funcType->get_parameters().size() == 1;
+                }
+                return false;
         }
 

src/InitTweak/InitTweak.h

@@ -35 +35 @@
         bool isDesignated( Initializer * init );
 
+  /// 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.
         /// Intended to be used for default ctor/dtor calls, but might have use elsewhere.