Changeset b067d9b for src/SynTree/AddressExpr.cc

Timestamp:

Oct 29, 2019, 4:01:24 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

773db65, 9421f3d8

Parents:

7951100 (diff), 8364209 (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

File:

• src/SynTree/AddressExpr.cc (modified) (2 diffs)

src/SynTree/AddressExpr.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 23:54:44 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Tue Apr 26 12:35:13 2016
-// Update Count     : 6
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Feb 28 13:13:38 2019
+// Update Count     : 10
 //
 
@@ -42 +42 @@
 AddressExpr::AddressExpr( Expression *arg ) : Expression(), arg( arg ) {
         if ( arg->result ) {
-                if ( arg->result->get_lvalue() ) {
+                if ( arg->get_lvalue() ) {
                         // lvalue, retains all layers of reference and gains a pointer inside the references
                         set_result( addrType( arg->result ) );
                 } else {
                         // taking address of non-lvalue -- must be a reference, loses one layer of reference
-                        ReferenceType * refType = strict_dynamic_cast< ReferenceType * >( arg->result );
-                        set_result( addrType( refType->base ) );
+                        if ( ReferenceType * refType = dynamic_cast< ReferenceType * >( arg->result ) ) {
+                                set_result( addrType( refType->base ) );
+                        } else {
+                                SemanticError( arg->result, "Attempt to take address of non-lvalue expression: " );
+                        } // if
                 }
-                // result of & is never an lvalue
-                get_result()->set_lvalue( false );
         }
 }