Changeset 79b5869 for src/Tuples

Timestamp:

May 24, 2017, 5:27:07 PM (9 years ago)

Author:

Andrew Beach <ajbeach@…>

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:

d997f8e

Parents:

79308c8e (diff), cf0b892 (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/Tuples/TupleExpansion.cc (modified) (1 diff)

src/Tuples/TupleExpansion.cc

@@ -332 +332 @@
         TypeInstType * isTtype( Type * type ) {
                 if ( TypeInstType * inst = dynamic_cast< TypeInstType * >( type ) ) {
-                        if ( inst->get_baseType()->get_kind() == TypeDecl::Ttype ) {
+                        if ( inst->get_baseType() && inst->get_baseType()->get_kind() == TypeDecl::Ttype ) {
                                 return inst;
                         }