Changeset 9aaac6e9 for src/GenPoly

Timestamp:

Aug 23, 2017, 5:18:22 PM (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:

ec55ed5

Parents:

8135d4c

Message:

Fix prelude warnings

File:

• src/GenPoly/Lvalue.cc (modified) (2 diffs)

src/GenPoly/Lvalue.cc

@@ -70 +70 @@
                 };
 
-                struct FixIntrinsicResult final {
+                struct FixIntrinsicResult final : public WithGuards {
                         Expression * postmutate( ApplicationExpr * appExpr );
+                        void premutate( FunctionDecl * funcDecl );
+                        bool inIntrinsic = false;
                 };
 
@@ -162 +164 @@
                                 appExpr->set_result( result->stripReferences()->clone() );
                                 appExpr->get_result()->set_lvalue( true );
-                                Expression * ret = new CastExpr( appExpr, result );
-                                ret->set_env( appExpr->get_env() );
-                                appExpr->set_env( nullptr );
-                                return ret;
+                                if ( ! inIntrinsic ) {
+                                        // when not in an intrinsic function, add a cast to
+                                        // don't add cast when in an intrinsic function, since they already have the cast
+                                        Expression * ret = new CastExpr( appExpr, result );
+                                        ret->set_env( appExpr->get_env() );
+                                        appExpr->set_env( nullptr );
+                                        return ret;
+                                }
+                                delete result;
                         }
                         return appExpr;
+                }
+
+                void FixIntrinsicResult::premutate( FunctionDecl * funcDecl ) {
+                        GuardValue( inIntrinsic );
+                        inIntrinsic =  funcDecl->linkage == LinkageSpec::Intrinsic;
                 }