Changeset 6054b18 for src/GenPoly/Lvalue.cc

Timestamp:

May 29, 2019, 9:09:30 PM (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:

466fa01

Parents:

c786e1d (diff), d88f8b3b (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/GenPoly/Lvalue.cc (modified) (4 diffs)

src/GenPoly/Lvalue.cc

@@ -21 +21 @@
 #include "Lvalue.h"
 
+#include "InitTweak/InitTweak.h"
 #include "Parser/LinkageSpec.h"          // for Spec, isBuiltin, Intrinsic
 #include "ResolvExpr/TypeEnvironment.h"  // for AssertionSet, OpenVarSet
 #include "ResolvExpr/Unify.h"            // for unify
 #include "ResolvExpr/typeops.h"
-#include "SymTab/Autogen.h"
 #include "SymTab/Indexer.h"              // for Indexer
 #include "SynTree/Declaration.h"         // for Declaration, FunctionDecl
@@ -33 +33 @@
 #include "SynTree/Type.h"                // for PointerType, Type, FunctionType
 #include "SynTree/Visitor.h"             // for Visitor, acceptAll
+#include "Validate/FindSpecialDecls.h"   // for dereferenceOperator
 
 #if 0
@@ -44 +45 @@
                 // TODO: fold this into the general createDeref function??
                 Expression * mkDeref( Expression * arg ) {
-                        if ( SymTab::dereferenceOperator ) {
+                        if ( Validate::dereferenceOperator ) {
                                 // note: reference depth can be arbitrarily deep here, so peel off the outermost pointer/reference, not just pointer because they are effecitvely equivalent in this pass
-                                VariableExpr * deref = new VariableExpr( SymTab::dereferenceOperator );
+                                VariableExpr * deref = new VariableExpr( Validate::dereferenceOperator );
                                 deref->result = new PointerType( Type::Qualifiers(), deref->result );
                                 Type * base = InitTweak::getPointerBase( arg->result );
@@ -353 +354 @@
                         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();