Changeset f8b69da7 for src

Timestamp:

Aug 29, 2018, 3:23:55 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

a715b5c

Parents:

a42a654 (diff), 546b51e (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' into cleanup-dtors

Location:

src

Files:

• GenPoly/Lvalue.cc (modified) (1 diff)
• Parser/parser.yy (modified) (1 diff)
• Virtual/ExpandCasts.cc (modified) (1 diff)

src/GenPoly/Lvalue.cc

@@ -353 +353 @@
                         Type * destType = castExpr->result;
                         Type * srcType = castExpr->arg->result;
+                        assertf( destType, "Cast to no type in: %s", toCString( castExpr ) );
+                        assertf( srcType, "Cast from no type in: %s", toCString( castExpr ) );
                         int depth1 = destType->referenceDepth();
                         int depth2 = srcType->referenceDepth();

src/Parser/parser.yy

@@ -1310 +1310 @@
 
 handler_clause:
-        handler_key '(' push exception_declaration pop handler_predicate_opt ')' compound_statement pop
+        handler_key '(' push exception_declaration pop handler_predicate_opt ')' compound_statement
                 { $$ = new StatementNode( build_catch( $1, $4, $6, $8 ) ); }
-        | handler_clause handler_key '(' push exception_declaration pop handler_predicate_opt ')' compound_statement pop
+        | handler_clause handler_key '(' push exception_declaration pop handler_predicate_opt ')' compound_statement
                 { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( $2, $5, $7, $9 ) ) ); }
         ;

src/Virtual/ExpandCasts.cc

@@ -147 +147 @@
                                 //              )
                                 //      ),
-                        new UntypedExpr( new NameExpr( "__cfa__virtual_cast" ), {
+                        new ApplicationExpr( VariableExpr::functionPointer( vcast_decl ), {
                                         new CastExpr(
                                                 new AddressExpr( new VariableExpr( table ) ),
                                                 pointer_to_pvt(1)
-                                                ),
+                                        ),
                                         new CastExpr(
                                                 castExpr->get_arg(),
                                                 pointer_to_pvt(2)
-                                                )
-                                } ),
+                                        )
+                        } ),
                         castExpr->get_result()->clone()
-                        );
+                );
 
                 castExpr->set_arg( nullptr );