Changeset 1cdfa82 for src/InitTweak

Timestamp:

Apr 25, 2018, 4:55:53 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

42107b4

Parents:

2efe4b8 (diff), 9d5fb67 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'origin/master' into with_gc

File:

• src/InitTweak/InitTweak.cc (modified) (1 diff)

src/InitTweak/InitTweak.cc

@@ -529 +529 @@
                 }
                 if ( dynamic_cast< ReferenceType * >( dst->result ) ) {
-                        dst = new AddressExpr( dst );
+                        for (int depth = dst->result->referenceDepth(); depth > 0; depth--) {
+                                dst = new AddressExpr( dst );
+                        }
                 } else {
                         dst = new CastExpr( dst, new ReferenceType( noQualifiers, dst->result->clone() ) );
                 }
                 if ( dynamic_cast< ReferenceType * >( src->result ) ) {
-                        src = new CastExpr( src, new ReferenceType( noQualifiers, src->result->stripReferences()->clone() ) );
+                        for (int depth = src->result->referenceDepth(); depth > 0; depth--) {
+                                src = new AddressExpr( src );
+                        }
+                        // src = new CastExpr( src, new ReferenceType( noQualifiers, src->result->stripReferences()->clone() ) );
                 }
                 return new ApplicationExpr( VariableExpr::functionPointer( assign ), { dst, src } );