Changes in src/GenPoly/ScrubTyVars.cc [68f9c43:b8a4f47]

File:

• src/GenPoly/ScrubTyVars.cc (modified) (4 diffs)

src/GenPoly/ScrubTyVars.cc

@@ -28 +28 @@
                 if ( ! tyVars ) {
                         if ( typeInst->get_isFtype() ) {
-                                return new PointerType{ Type::Qualifiers(), new FunctionType( Type::Qualifiers(), true ) };
+                                delete typeInst;
+                                return new PointerType( Type::Qualifiers(), new FunctionType( Type::Qualifiers(), true ) );
                         } else {
-                                return new PointerType{ Type::Qualifiers(), new VoidType( typeInst->get_qualifiers() ) };
+                                PointerType * ret = new PointerType( Type::Qualifiers(), new VoidType( typeInst->get_qualifiers() ) );
+                                delete typeInst;
+                                return ret;
                         }
                 }
@@ -39 +42 @@
                           case TypeDecl::Dtype:
                           case TypeDecl::Ttype:
-                                return new PointerType{ Type::Qualifiers(), new VoidType( typeInst->get_qualifiers() ) };
+                                {
+                                        PointerType * ret = new PointerType( Type::Qualifiers(), new VoidType( typeInst->get_qualifiers() ) );
+                                        delete typeInst;
+                                        return ret;
+                                }
                           case TypeDecl::Ftype:
-                                return new PointerType{ Type::Qualifiers(), new FunctionType( Type::Qualifiers(), true ) };
+                                delete typeInst;
+                                return new PointerType( Type::Qualifiers(), new FunctionType( Type::Qualifiers(), true ) );
                         } // switch
                 } // if
@@ -49 +57 @@
         Type * ScrubTyVars::mutateAggregateType( Type * ty ) {
                 if ( shouldScrub( ty ) ) {
-                        return new PointerType{ Type::Qualifiers(), new VoidType( ty->get_qualifiers() ) };
+                        PointerType * ret = new PointerType( Type::Qualifiers(), new VoidType( ty->get_qualifiers() ) );
+                        delete ty;
+                        return ret;
                 }
                 return ty;
@@ -94 +104 @@
                         Type * ret = dynType->acceptMutator( *visitor );
                         ret->get_qualifiers() |= pointer->get_qualifiers();
+                        pointer->base = nullptr;
+                        delete pointer;
                         return ret;
                 }