Changeset 68f9c43 for src/ResolvExpr/Unify.cc

Timestamp:

Mar 16, 2018, 5:15:02 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

8d7bef2

Parents:

6171841

git-author:

Aaron Moss <a3moss@…> (03/16/18 17:04:24)

git-committer:

Aaron Moss <a3moss@…> (03/16/18 17:15:02)

Message:

First pass at delete removal

File:

• src/ResolvExpr/Unify.cc (modified) (8 diffs)

src/ResolvExpr/Unify.cc

@@ -99 +99 @@
                 findOpenVars( newSecond, openVars, closedVars, needAssertions, haveAssertions, true );
 
-                bool result = unifyExact( newFirst, newSecond, newEnv, needAssertions, haveAssertions, openVars, WidenMode( false, false ), indexer );
-                delete newFirst;
-                delete newSecond;
-                return result;
+                return unifyExact( newFirst, newSecond, newEnv, needAssertions, haveAssertions, openVars, WidenMode( false, false ), indexer );
         }
 
@@ -123 +120 @@
 ///   newSecond->print( std::cerr );
 ///   std::cerr << std::endl;
-                bool result = unifyExact( newFirst, newSecond, newEnv, needAssertions, haveAssertions, openVars, WidenMode( false, false ), indexer );
-                delete newFirst;
-                delete newSecond;
-                return result;
+                return unifyExact( newFirst, newSecond, newEnv, needAssertions, haveAssertions, openVars, WidenMode( false, false ), indexer );
         }
 
@@ -176 +170 @@
                                         if ( common ) {
                                                 common->get_qualifiers() = Type::Qualifiers();
-                                                delete curClass.type;
                                                 curClass.type = common;
                                                 env.add( curClass );
@@ -239 +232 @@
                                 if ( common ) {
                                         common->get_qualifiers() = Type::Qualifiers();
-                                        delete class1.type;
                                         class1.type = common;
                                 } // if
@@ -272 +264 @@
                         env.add( newClass );
                 } // if
-                delete type1;
-                delete type2;
                 return result;
         }
@@ -282 +272 @@
                 findOpenVars( type2, openVars, closedVars, needAssertions, haveAssertions, true );
                 Type *commonType = 0;
-                if ( unifyInexact( type1, type2, env, needAssertions, haveAssertions, openVars, WidenMode( true, true ), indexer, commonType ) ) {
-                        if ( commonType ) {
-                                delete commonType;
-                        } // if
-                        return true;
-                } else {
-                        return false;
-                } // if
+                return unifyInexact( type1, type2, env, needAssertions, haveAssertions, openVars, WidenMode( true, true ), indexer, commonType );
         }
 
@@ -544 +527 @@
                                         // expand ttype parameter into its actual type
                                         if ( eqvClass.type ) {
-                                                delete typeInst;
                                                 return eqvClass.type->clone();
                                         }
@@ -569 +551 @@
                                 dst.push_back( new ObjectDecl( "", Type::StorageClasses(), LinkageSpec::C, nullptr, t, nullptr ) );
                         }
-                        delete dcl;
                 }
         }