Changeset 76ed81f for src/AST/Expr.cpp

Timestamp:

May 22, 2019, 5:22:30 PM (5 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

893e106

Parents:

6380f78

Message:

Broken stuff pre-Pass fix

File:

• src/AST/Expr.cpp (modified) (1 diff)

src/AST/Expr.cpp

@@ -159 +159 @@
         assert( aggregate->result );
 
+        // #warning Needs GenericSubsitution.cpp building to work correctly
+        // result.set_and_mutate( mem->get_type() )->qualifiers |= aggregate->result->qualifiers | CV::Lvalue;  // FIXME temporary patch
+
         // take ownership of member type
-        Type * res = result.set_and_mutate( mem->get_type() );
+        result = mem->get_type();
         // substitute aggregate generic parameters into member type
-        genericSubsitution( aggregate->result ).apply( res );
+        genericSubsitution( aggregate->result ).apply( result );
         // ensure lvalue and appropriate restrictions from aggregate type
-        res->set_lvalue( true );
-        res->qualifiers |= aggregate->result->qualifiers;
-        // ensure changes propegated back into result
-        result = res;
+        result.get_and_mutate()->qualifiers |= aggregate->result->qualifiers | CV::Lvalue;
 }