Changeset eb50842

Timestamp:

Jun 26, 2015, 1:43:41 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

937e51d

Parents:

0f19d763

Message:

Fixed pointer to pointer to const bug

Files:

• .gitignore (modified) (1 diff)
• src/ResolvExpr/FindOpenVars.h (modified) (1 diff)
• src/ResolvExpr/Unify.cc (modified) (4 diffs)

.gitignore

@@ +1 @@
+# build files
+*.[ado]
+
+# generated by configure
 Makefile
-autom4te.cache/
+aclocal.m4
+autom4te.cache
 config.h
+config.status
 config.log
-config.status
+stamp-h1
 driver/Makefile
+libcfa/Makefile
+src/Makefile
+
+# build directories
+bin
+lib
+
+# src executables, for lib and bin
 driver/cc1
-driver/cc1.o
 driver/cfa
-driver/cfa.o
-libcfa/Makefile
-libcfa/builtins.c
-libcfa/builtins.cf
+src/cfa-cpp
 libcfa/libcfa-prelude.c
-libcfa/libcfa-prelude.o
-libcfa/libcfa.a
-src/*/*.d
-src/*/*.o
-src/MakeLibCfa.d
-src/MakeLibCfa.o
+
+# generated by bison and lex from cfa.y and lex.l, respectively
 src/Parser/cfa.output
 src/Parser/cfa.tab.cc
 src/Parser/cfa.tab.h
 src/Parser/lex.yy.cc
-src/cfa-cpp
-src/main.d
-src/main.o
-stamp-h1

src/ResolvExpr/FindOpenVars.h

@@ -21 +21 @@
 
 namespace ResolvExpr {
+        // Updates open and closed variables and their associated assertions
         void findOpenVars( Type *type, OpenVarSet &openVars, OpenVarSet &closedVars, AssertionSet &needAssertions, AssertionSet &haveAssertions, bool firstIsOpen );
 } // namespace ResolvExpr

src/ResolvExpr/Unify.cc

@@ -73 +73 @@
         };
 
+        /// Attempts an inexact unification of type1 and type2.
+        /// Returns false if no such unification; if the types can be unified, sets common (unless they unify exactly and have identical type qualifiers)
         bool unifyInexact( Type *type1, Type *type2, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, WidenMode widenMode, const SymTab::Indexer &indexer, Type *&common );
         bool unifyExact( Type *type1, Type *type2, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, WidenMode widenMode, const SymTab::Indexer &indexer );
@@ -148 +150 @@
                         if ( curClass.type ) {
                                 Type *common = 0;
+                                // attempt to unify equivalence class type (which has qualifiers stripped, so they must be restored) with the type to bind to
                                 std::auto_ptr< Type > newType( curClass.type->clone() );
+                                newType->get_qualifiers() = typeInst->get_qualifiers();
                                 if ( unifyInexact( newType.get(), other, env, needAssertions, haveAssertions, openVars, widenMode & WidenMode( curClass.allowWidening, true ), indexer, common ) ) {
                                         if ( common ) {
@@ -279 +283 @@
                 TypeEnvironment debugEnv( env );
 #endif
+                if ( type1->get_qualifiers() != type2->get_qualifiers() ) {
+                        return false;
+                }
+
                 bool result;
                 TypeInstType *var1 = dynamic_cast< TypeInstType* >( type1 );
@@ -291 +299 @@
                 bool isopen1 = var1 && ( entry1 != openVars.end() );
                 bool isopen2 = var2 && ( entry2 != openVars.end() );
-                if ( type1->get_qualifiers() != type2->get_qualifiers() ) {
-                        return false;
-                } else if ( isopen1 && isopen2 && entry1->second == entry2->second ) {
+
+                if ( isopen1 && isopen2 && entry1->second == entry2->second ) {
                         result = bindVarToVar( var1, var2, entry1->second, env, needAssertions, haveAssertions, openVars, widenMode, indexer );
                 } else if ( isopen1 ) {