Changeset 0d70e0d for src

Timestamp:

May 28, 2019, 3:35:00 PM (5 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:

eba615c

Parents:

2c04369

Message:

I'll be fixing this fix a different way.

Location:

src

Files:

• GenPoly/Lvalue.cc (modified) (4 diffs)
• SymTab/Autogen.h (modified) (2 diffs)
• SymTab/Validate.cc (modified) (5 diffs)

src/GenPoly/Lvalue.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Tue May 28 11:07:00 2019
-// Update Count     : 6
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Mar 17 09:11:18 2017
+// Update Count     : 5
 //
 
@@ -42 +42 @@
 namespace GenPoly {
         namespace {
-                /// 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 {
+                // 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 {
                         Expression * postmutate( CastExpr * castExpr );
                         Expression * postmutate( AddressExpr * addrExpr );
@@ -85 +66 @@
 
                 /// Intrinsic functions that take reference parameters don't REALLY take reference parameters -- their reference arguments must always be implicitly dereferenced.
-                struct FixIntrinsicArgs final : public WithDerefOp {
+                struct FixIntrinsicArgs final {
                         Expression * postmutate( ApplicationExpr * appExpr );
                 };
@@ -117 +98 @@
                 };
 
-                struct AddrRef final : public WithGuards, public WithVisitorRef<AddrRef>,
-                                public WithShortCircuiting, public WithDerefOp {
+                struct AddrRef final : public WithGuards, public WithVisitorRef<AddrRef>, public WithShortCircuiting {
                         void premutate( AddressExpr * addrExpr );
                         Expression * postmutate( AddressExpr * addrExpr );

src/SymTab/Autogen.h

@@ -9 +9 @@
 // Author           : Rob Schluntz
 // Created On       : Sun May 17 21:53:34 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Tue May 28 11:04:00 2019
-// Update Count     : 16
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:50:25 2017
+// Update Count     : 15
 //
 
@@ -40 +40 @@
         /// such as in determining array dimension type
         extern Type * SizeType;
+
+        /// intrinsic dereference operator for unqualified types - set when *? function is seen in FindSpecialDeclarations.
+        /// Useful for creating dereference ApplicationExprs without a full resolver pass.
+        extern FunctionDecl * dereferenceOperator;
 
         // generate the type of an assignment function for paramType

src/SymTab/Validate.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:50:04 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Tue May 28 11:07:00 2019
-// Update Count     : 360
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Aug 28 13:47:23 2017
+// Update Count     : 359
 //
 
@@ -288 +288 @@
         };
 
+        FunctionDecl * dereferenceOperator = nullptr;
+        struct FindSpecialDeclarations final {
+                void previsit( FunctionDecl * funcDecl );
+        };
+
         void validate( std::list< Declaration * > &translationUnit, __attribute__((unused)) bool doDebug ) {
                 PassVisitor<EnumAndPointerDecay> epc;
@@ -294 +299 @@
                 PassVisitor<CompoundLiteral> compoundliteral;
                 PassVisitor<ValidateGenericParameters> genericParams;
+                PassVisitor<FindSpecialDeclarations> finder;
                 PassVisitor<LabelAddressFixer> labelAddrFixer;
                 PassVisitor<HoistTypeDecls> hoistDecls;
@@ -370 +376 @@
                         Stats::Time::TimeBlock("Array Length", [&]() {
                                 ArrayLength::computeLength( translationUnit );
+                        });
+                        Stats::Time::TimeBlock("Find Special Declarations", [&]() {
+                                acceptAll( translationUnit, finder ); // xxx - remove this pass soon
                         });
                         Stats::Time::TimeBlock("Fix Label Address", [&]() {
@@ -1363 +1372 @@
                 return addrExpr;
         }
+
+        void FindSpecialDeclarations::previsit( FunctionDecl * funcDecl ) {
+                if ( ! dereferenceOperator ) {
+                        if ( funcDecl->get_name() == "*?" && funcDecl->get_linkage() == LinkageSpec::Intrinsic ) {
+                                FunctionType * ftype = funcDecl->get_functionType();
+                                if ( ftype->get_parameters().size() == 1 && ftype->get_parameters().front()->get_type()->get_qualifiers() == Type::Qualifiers() ) {
+                                        dereferenceOperator = funcDecl;
+                                }
+                        }
+                }
+        }
 } // namespace SymTab