Changeset 946bcca for src/SymTab

Timestamp:

Mar 17, 2017, 1:14:44 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

14a33790, 7c70089, 89d129c

Parents:

b2f5082 (diff), 615a096 (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:/u/cforall/software/cfa/cfa-cc

Location:

src/SymTab

Files:

• Autogen.cc (modified) (2 diffs)
• Autogen.h (modified) (2 diffs)
• ImplementationType.cc (modified) (3 diffs)
• Mangler.cc (modified) (3 diffs)
• Validate.cc (modified) (3 diffs)

src/SymTab/Autogen.cc

@@ -10 +10 @@
 // Created On       : Thu Mar 03 15:45:56 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 16 08:37:22 2017
-// Update Count     : 59
+// Last Modified On : Fri Mar 17 09:41:08 2017
+// Update Count     : 60
 //
 
@@ -323 +323 @@
                                 }
 
-                                if ( type->get_qualifiers().isConst && func->get_name() == "?=?" ) {
+                                if ( type->get_const() && func->get_name() == "?=?" ) {
                                         // don't assign const members, but do construct/destruct
                                         continue;

src/SymTab/Autogen.h

@@ -10 +10 @@
 // Created On       : Sun May 17 21:53:34 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 16 07:51:39 2017
-// Update Count     : 8
+// Last Modified On : Fri Mar 17 09:10:41 2017
+// Update Count     : 9
 //
 
@@ -60 +60 @@
 //                      castType->get_qualifiers() -= Type::Qualifiers(true, true, true, false, true, false);
                         castType->get_qualifiers() -= Type::Qualifiers( Type::Const | Type::Volatile | Type::Restrict | Type::Atomic );
-                        castType->set_isLvalue( true ); // xxx - might not need this
+                        castType->set_lvalue( true ); // xxx - might not need this
                         dstParam = new CastExpr( dstParam, new PointerType( Type::Qualifiers(), castType ) );
                 }

src/SymTab/ImplementationType.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:32:01 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  2 17:31:20 2016
-// Update Count     : 3
+// Last Modified On : Thu Mar 16 15:54:08 2017
+// Update Count     : 4
 //
 
@@ -105 +105 @@
                 if ( typeDecl && typeDecl->get_base() ) {
                         Type *base = implementationType( typeDecl->get_base(), indexer );
-                        base->get_qualifiers() += inst->get_qualifiers();
+                        base->get_qualifiers() |= inst->get_qualifiers();
                         result = base;
                 } // if
@@ -114 +114 @@
                 for ( std::list< Type* >::iterator i = tupleType->get_types().begin(); i != tupleType->get_types().end(); ++i ) {
                         Type *implType = implementationType( *i, indexer );
-                        implType->get_qualifiers() += tupleType->get_qualifiers();
+                        implType->get_qualifiers() |= tupleType->get_qualifiers();
                         newType->get_types().push_back( implType );
                 } // for

src/SymTab/Mangler.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:40:29 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Aug 19 15:52:24 2015
-// Update Count     : 19
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Mar 17 09:40:01 2017
+// Update Count     : 20
 //
 
@@ -294 +294 @@
                         mangleName << "_";
                 } // if
-                if ( type->get_isConst() ) {
+                if ( type->get_const() ) {
                         mangleName << "C";
                 } // if
-                if ( type->get_isVolatile() ) {
+                if ( type->get_volatile() ) {
                         mangleName << "V";
                 } // if
@@ -304 +304 @@
 //                      mangleName << "R";
 //              } // if
-                if ( type->get_isLvalue() ) {
+                if ( type->get_lvalue() ) {
                         mangleName << "L";
                 } // if
-                if ( type->get_isAtomic() ) {
+                if ( type->get_atomic() ) {
                         mangleName << "A";
                 } // if

src/SymTab/Validate.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:50:04 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 16 08:02:54 2017
-// Update Count     : 351
+// Last Modified On : Thu Mar 16 16:39:15 2017
+// Update Count     : 353
 //
 
@@ -611 +611 @@
                 if ( def != typedefNames.end() ) {
                         Type *ret = def->second.first->get_base()->clone();
-                        ret->get_qualifiers() += typeInst->get_qualifiers();
+                        ret->get_qualifiers() |= typeInst->get_qualifiers();
                         // place instance parameters on the typedef'd type
                         if ( ! typeInst->get_parameters().empty() ) {
@@ -656 +656 @@
                 // hence the type-name "screen" must be defined.
                 // Note, qualifiers on the typedef are superfluous for the forward declaration.
-                if ( StructInstType *aggDecl = dynamic_cast< StructInstType * >( tyDecl->get_base() ) ) {
+
+                Type *designatorType = tyDecl->get_base()->stripDeclarator();
+                if ( StructInstType *aggDecl = dynamic_cast< StructInstType * >( designatorType ) ) {
                         return new StructDecl( aggDecl->get_name() );
-                } else if ( UnionInstType *aggDecl = dynamic_cast< UnionInstType * >( tyDecl->get_base() ) ) {
+                } else if ( UnionInstType *aggDecl = dynamic_cast< UnionInstType * >( designatorType ) ) {
                         return new UnionDecl( aggDecl->get_name() );
-                } else if ( EnumInstType *enumDecl = dynamic_cast< EnumInstType * >( tyDecl->get_base() ) ) {
+                } else if ( EnumInstType *enumDecl = dynamic_cast< EnumInstType * >( designatorType ) ) {
                         return new EnumDecl( enumDecl->get_name() );
                 } else {