Changeset 85b2300

Timestamp:

Jun 11, 2018, 1:48:57 PM (6 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, with_gc

Children:

1057e3d

Parents:

61accc5

Message:

Minor code cleanup

Location:

src

Files:

• CodeGen/CodeGenerator.cc (modified) (1 diff)
• Common/Debug.h (modified) (1 diff)
• GenPoly/Lvalue.cc (modified) (3 diffs)

src/CodeGen/CodeGenerator.cc

@@ -133 +133 @@
                 output << "__attribute__ ((";
                 for ( list< Attribute * >::iterator attr( attributes.begin() );; ) {
-                        output << (*attr)->get_name();
-                        if ( ! (*attr)->get_parameters().empty() ) {
+                        output << (*attr)->name;
+                        if ( ! (*attr)->parameters.empty() ) {
                                 output << "(";
-                                genCommaList( (*attr)->get_parameters().begin(), (*attr)->get_parameters().end() );
+                                genCommaList( (*attr)->parameters.begin(), (*attr)->parameters.end() );
                                 output << ")";
                         } // if

src/Common/Debug.h

@@ -28 +28 @@
 namespace Debug {
         /// debug codegen a translation unit
-        static inline void codeGen( __attribute__((unused)) const std::list< Declaration * > & translationUnit, __attribute__((unused)) const std::string & label, __attribute__((unused)) LinkageSpec::Spec linkageFilter = LinkageSpec::Compiler ) {
+        static inline void codeGen( __attribute__((unused)) const std::list< Declaration * > & translationUnit, __attribute__((unused)) const std::string & label, __attribute__((unused)) LinkageSpec::Spec linkageFilter = LinkageSpec::Builtin ) {
         #ifdef DEBUG
                 std::list< Declaration * > decls;

src/GenPoly/Lvalue.cc

@@ -146 +146 @@
 
         namespace {
-                // true for intrinsic function calls that return a reference
+                // true for intrinsic function calls that return an lvalue in C
                 bool isIntrinsicReference( Expression * expr ) {
+                        // known intrinsic-reference prelude functions
+                        static std::set<std::string> lvalueFunctions = { "*?", "?[?]" };
                         if ( UntypedExpr * untyped = dynamic_cast< UntypedExpr * >( expr ) ) {
                                 std::string fname = InitTweak::getFunctionName( untyped );
-                                // known intrinsic-reference prelude functions
-                                return fname == "*?" || fname == "?[?]";
+                                return lvalueFunctions.count(fname);
                         } else if ( ApplicationExpr * appExpr = dynamic_cast< ApplicationExpr * > ( expr ) ) {
                                 if ( DeclarationWithType * func = InitTweak::getFunction( appExpr ) ) {
-                                        // use type of return variable rather than expr result type, since it may have been changed to a pointer type
-                                        FunctionType * ftype = GenPoly::getFunctionType( func->get_type() );
-                                        Type * ret = ftype->returnVals.empty() ? nullptr : ftype->returnVals.front()->get_type();
-                                        return func->linkage == LinkageSpec::Intrinsic && dynamic_cast<ReferenceType *>( ret );
+                                        return func->linkage == LinkageSpec::Intrinsic && lvalueFunctions.count(func->name);
                                 }
                         }
@@ -212 +210 @@
                                                 // TODO: it's likely that the second condition should be ... && ! isIntrinsicReference( arg ), but this requires investigation.
 
-                                                if ( function->get_linkage() != LinkageSpec::Intrinsic && isIntrinsicReference( arg ) ) {
+                                                if ( function->linkage != LinkageSpec::Intrinsic && isIntrinsicReference( arg ) ) {
                                                         // needed for definition of prelude functions, etc.
                                                         // if argument is dereference or array subscript, the result isn't REALLY a reference, but non-intrinsic functions expect a reference: take address
@@ -228 +226 @@
                                                         arg = new AddressExpr( arg );
                                                 // } else if ( function->get_linkage() == LinkageSpec::Intrinsic && InitTweak::getPointerBase( arg->result ) ) {
-                                                } else if ( function->get_linkage() == LinkageSpec::Intrinsic && arg->result->referenceDepth() != 0 ) {
+                                                } else if ( function->linkage == LinkageSpec::Intrinsic && arg->result->referenceDepth() != 0 ) {
                                                         // argument is a 'real' reference, but function expects a C lvalue: add a dereference to the reference-typed argument
                                                         PRINT(