Changeset 2c04369 for src/GenPoly

Timestamp:

May 28, 2019, 12:04:43 PM (6 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

0d70e0d

Parents:

a7d50b6

Message:

Fixed some problems in convert. One of which was better solved by removing the FindSpecialDeclarations hack.

File:

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

src/GenPoly/Lvalue.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 17 09:11:18 2017
-// Update Count     : 5
+// Last Modified By : Andrew Beach
+// Last Modified On : Tue May 28 11:07:00 2019
+// Update Count     : 6
 //
 
@@ -42 +42 @@
 namespace GenPoly {
         namespace {
-                // TODO: fold this into the general createDeref function??
-                Expression * mkDeref( Expression * arg ) {
-                        if ( SymTab::dereferenceOperator ) {
-                                // note: reference depth can be arbitrarily deep here, so peel off the outermost pointer/reference, not just pointer because they are effecitvely equivalent in this pass
-                                VariableExpr * deref = new VariableExpr( SymTab::dereferenceOperator );
-                                deref->result = new PointerType( Type::Qualifiers(), deref->result );
-                                Type * base = InitTweak::getPointerBase( arg->result );
-                                assertf( base, "expected pointer type in dereference (type was %s)", toString( arg->result ).c_str() );
-                                ApplicationExpr * ret = new ApplicationExpr( deref, { arg } );
-                                delete ret->result;
-                                ret->result = base->clone();
-                                ret->result->set_lvalue( true );
-                                return ret;
-                        } else {
-                                return UntypedExpr::createDeref( arg );
-                        }
-                }
-
-                struct ReferenceConversions final : public WithStmtsToAdd {
+                /// Local helper for pass visitors that need to add reference operations.
+                struct WithDerefOp {
+                        FunctionDecl * dereferenceOperator = nullptr;
+
+                        // TODO: fold this into the general createDeref function??
+                        Expression * mkDeref( Expression * arg ) {
+                                if ( dereferenceOperator ) {
+                                        // note: reference depth can be arbitrarily deep here, so peel off the
+                                        // outermost pointer/reference, not just pointer because they are effecitvely
+                                        // equivalent in this pass
+                                        VariableExpr * deref = new VariableExpr( dereferenceOperator );
+                                        deref->result = new PointerType( Type::Qualifiers(), deref->result );
+                                        Type * base = InitTweak::getPointerBase( arg->result );
+                                        assertf( base, "expected pointer type in dereference (type was %s)",
+                                                toString( arg->result ).c_str() );
+                                        ApplicationExpr * ret = new ApplicationExpr( deref, { arg } );
+                                        delete ret->result;
+                                        ret->result = base->clone();
+                                        ret->result->set_lvalue( true );
+                                        return ret;
+                                } else {
+                                        return UntypedExpr::createDeref( arg );
+                                }
+                        }
+
+                        void previsit( FunctionDecl * funcDecl ) {
+                                if ( dereferenceOperator ) return;
+                                if ( funcDecl->get_name() != "*?" ) return;
+                                if ( funcDecl->get_linkage() == LinkageSpec::Intrinsic ) return;
+                                FunctionType * ftype = funcDecl->get_functionType();
+                                if ( ftype->get_parameters().size() != 1 ) return;
+                                DeclarationWithType * arg0 = ftype->get_parameters().front();
+                                if ( arg0->get_type()->get_qualifiers() == Type::Qualifiers() ) return;
+                                dereferenceOperator = funcDecl;
+                        }
+                };
+
+                struct ReferenceConversions final : public WithStmtsToAdd, public WithDerefOp {
                         Expression * postmutate( CastExpr * castExpr );
                         Expression * postmutate( AddressExpr * addrExpr );
@@ -66 +85 @@
 
                 /// Intrinsic functions that take reference parameters don't REALLY take reference parameters -- their reference arguments must always be implicitly dereferenced.
-                struct FixIntrinsicArgs final {
+                struct FixIntrinsicArgs final : public WithDerefOp {
                         Expression * postmutate( ApplicationExpr * appExpr );
                 };
@@ -98 +117 @@
                 };
 
-                struct AddrRef final : public WithGuards, public WithVisitorRef<AddrRef>, public WithShortCircuiting {
+                struct AddrRef final : public WithGuards, public WithVisitorRef<AddrRef>,
+                                public WithShortCircuiting, public WithDerefOp {
                         void premutate( AddressExpr * addrExpr );
                         Expression * postmutate( AddressExpr * addrExpr );