Changeset ce7bdc4

Timestamp:

Nov 30, 2019, 11:15:06 AM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

4fa8f1a

Parents:

ba3df4d (diff), 78cdb06 (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 branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Files:

• src/GenPoly/Lvalue.cc (modified) (3 diffs)
• tests/.expect/references.txt (modified) (1 diff)
• tests/references.cfa (modified) (1 diff)

src/GenPoly/Lvalue.cc

@@ -60 +60 @@
                 }
 
-                struct ReferenceConversions final : public WithStmtsToAdd {
+                struct ReferenceConversions final : public WithStmtsToAdd, public WithGuards {
                         Expression * postmutate( CastExpr * castExpr );
                         Expression * postmutate( AddressExpr * addrExpr );
@@ -71 +71 @@
 
                 struct FixIntrinsicResult final : public WithGuards {
+                        enum {
+                                NoSkip,
+                                Skip,
+                                SkipInProgress
+                        } skip = NoSkip;
+
+                        void premutate( AsmExpr * ) { GuardValue( skip ); skip = Skip; }
+                        void premutate( ApplicationExpr * ) { GuardValue( skip ); skip = (skip == Skip) ? SkipInProgress : NoSkip; }
+
+
                         Expression * postmutate( ApplicationExpr * appExpr );
                         void premutate( FunctionDecl * funcDecl );
@@ -162 +172 @@
 
                 Expression * FixIntrinsicResult::postmutate( ApplicationExpr * appExpr ) {
-                        if ( isIntrinsicReference( appExpr ) ) {
+                        if ( skip != SkipInProgress && isIntrinsicReference( appExpr ) ) {
                                 // eliminate reference types from intrinsic applications - now they return lvalues
                                 ReferenceType * result = strict_dynamic_cast< ReferenceType * >( appExpr->result );

tests/.expect/references.txt

@@ -36 +36 @@
 3
 3 9 { 1., 7. }, [1, 2, 3]
+4
 Destructing a Y
 Destructing a Y

tests/references.cfa

@@ -119 +119 @@
                 f( 3, a + b, (S){ 1.0, 7.0 }, (int [3]){ 1, 2, 3 } ); // two rvalue to reference
         }
+
+        {
+                int a = 3;
+                int *p = &a;
+                asm (
+                        "incl %[p]\n\t" :
+                        : [p] "m" (*p)
+                );
+                printf("%d\n", a);
+        }
 }