Changeset 207b496

Timestamp:

Apr 10, 2018, 3:16:31 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:

ba89e9b7

Parents:

5002738

Message:

Update FixIntrinsicArgs? conditions (not quite correct)

File:

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

src/GenPoly/Lvalue.cc

@@ -206 +206 @@
                                                 )
                                                 // 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 argument is dereference or array subscript, the result isn't REALLY a reference, but non-intrinsic functions expect a reference: take address
-                                                        PRINT(
-                                                                std::cerr << "===is intrinsic arg in non-intrinsic call - adding address" << std::endl;
-                                                        )
-                                                        arg = new AddressExpr( arg );
-                                                } else if ( function->get_linkage() == LinkageSpec::Intrinsic && arg->result->referenceDepth() != 0 ) {
+                                                // if ( function->get_linkage() != LinkageSpec::Intrinsic && isIntrinsicReference( arg ) ) {
+                                                //      // if argument is dereference or array subscript, the result isn't REALLY a reference, but non-intrinsic functions expect a reference: take address
+                                                //      // PRINT(
+                                                //              std::cerr << "===is intrinsic arg in non-intrinsic call - adding address" << std::endl;
+                                                //      // )
+                                                //      arg = new AddressExpr( arg );
+                                                // } else
+                                                // if ( function->get_linkage() == LinkageSpec::Intrinsic && arg->result->referenceDepth() != 0 ) {
+                                                if ( function->get_linkage() == LinkageSpec::Intrinsic && InitTweak::getPointerBase( arg->result ) ) {
+
+                                                        // needed for definition of prelude functions, etc.
+
                                                         // argument is a 'real' reference, but function expects a C lvalue: add a dereference to the reference-typed argument
                                                         PRINT(
@@ -221 +226 @@
                                                         PointerType * ptrType = new PointerType( Type::Qualifiers(), baseType->clone() );
                                                         delete arg->result;
-                                                        arg->set_result( ptrType );
+                                                        arg->result = ptrType;
                                                         arg = mkDeref( arg );
-                                                        assertf( arg->result->referenceDepth() == 0, "Reference types should have been eliminated from intrinsic function calls, but weren't: %s", toCString( arg->result ) );
+                                                        // assertf( arg->result->referenceDepth() == 0, "Reference types should have been eliminated from intrinsic function calls, but weren't: %s", toCString( arg->result ) );
                                                 }
                                         }