Changeset 57acae0

Timestamp:

Apr 23, 2018, 3:04:15 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, with_gc

Children:

9d5fb67

Parents:

da7fe39

git-author:

Rob Schluntz <rschlunt@…> (04/23/18 15:02:59)

git-committer:

Rob Schluntz <rschlunt@…> (04/23/18 15:04:15)

Message:

Update condition for adding cast to address-of-reference, update debug prints

Location:

src

Files:

• GenPoly/Lvalue.cc (modified) (3 diffs)
• InitTweak/InitTweak.cc (modified) (2 diffs)

src/GenPoly/Lvalue.cc

@@ -17 +17 @@
 #include <string>                        // for string
 
-#include "Common/Debug.h"
 #include "Common/PassVisitor.h"
 #include "GenPoly.h"                     // for isPolyType
@@ -129 +128 @@
                 PassVisitor<AddrRef> addrRef;
                 PassVisitor<FixIntrinsicResult> intrinsicResults;
-                Debug::codeGen( translationUnit, "begin" );
                 mutateAll( translationUnit, intrinsicResults );
-                Debug::codeGen( translationUnit, "intrinsicResults" );
                 mutateAll( translationUnit, addrRef );
-                Debug::codeGen( translationUnit, "addrRef" );
                 mutateAll( translationUnit, refCvt );
-                Debug::codeGen( translationUnit, "refCvt" );
                 mutateAll( translationUnit, fixer );
-                Debug::codeGen( translationUnit, "fixer" );
                 mutateAll( translationUnit, collapser );
-                Debug::codeGen( translationUnit, "collapser" );
                 mutateAll( translationUnit, genLval );
-                Debug::codeGen( translationUnit, "genLval" );
                 mutateAll( translationUnit, elim );  // last because other passes need reference types to work
-                Debug::codeGen( translationUnit, "elim" );
 
                 // from this point forward, no other pass should create reference types.
@@ -310 +301 @@
                                 }
 
-                                if ( addCast ) {
-                                        PRINT( std::cerr << "adding cast..." << std::endl; )
+                                // if addrExpr depth is 0, then the result is a pointer because the arg was depth 1 and not lvalue.
+                                // This means the dereference result is not a reference, is lvalue, and one less pointer depth than
+                                // the addrExpr. Thus the cast is meaningless.
+                                // TODO: One thing to double check is whether it is possible for the types to differ outside of the single
+                                // pointer level (i.e. can the base type of addrExpr differ from the type of addrExpr-arg?).
+                                // If so then the cast might need to be added, conditional on a more sophisticated check.
+                                if ( addCast && addrExpr->result->referenceDepth() != 0 ) {
+                                        PRINT( std::cerr << "adding cast to " << addrExpr->result << std::endl; )
                                         return new CastExpr( ret, addrExpr->result->clone() );
                                 }

src/InitTweak/InitTweak.cc

@@ -520 +520 @@
 
         ApplicationExpr * createBitwiseAssignment( Expression * dst, Expression * src ) {
-                std::cerr << "=== createBitwiseAssignment ===" << std::endl;
-                std::cerr << "== dst: " << dst << std::endl;
-                std::cerr << "== src: " << src << std::endl;
-
                 static FunctionDecl * assign = nullptr;
                 if ( ! assign ) {
@@ -544 +540 @@
                         // src = new CastExpr( src, new ReferenceType( noQualifiers, src->result->stripReferences()->clone() ) );
                 }
-                std::cerr << "============= endl : " << std::endl;
-                std::cerr << "-- dst: " << dst << std::endl;
-                std::cerr << "-- src: " << src << std::endl;
                 return new ApplicationExpr( VariableExpr::functionPointer( assign ), { dst, src } );
         }