Changes in / [6943a987:5e644d3e]

Location:

src

Files:

• Parser/LinkageSpec.cc (modified) (3 diffs)
• SymTab/Validate.cc (modified) (1 diff)
• SynTree/ReferenceToType.cc (modified) (4 diffs)
• SynTree/Type.h (modified) (1 diff)

src/Parser/LinkageSpec.cc

@@ -14 +14 @@
 //
 
+#include <memory>
 #include <string>
 #include <cassert>
@@ -21 +22 @@
 
 LinkageSpec::Spec LinkageSpec::fromString( const std::string &spec ) {
+        std::unique_ptr<const std::string> guard(&spec);                // allocated by lexer
         if ( spec == "\"Cforall\"" ) {
                 return Cforall;
@@ -28 +30 @@
                 throw SemanticError( "Invalid linkage specifier " + spec );
         } // if
-        delete &spec;                                                                           // allocated by lexer
 }
 

src/SymTab/Validate.cc

@@ -531 +531 @@
                         TypeDeclMap::const_iterator base = typedeclNames.find( typeInst->get_name() );
                         assert( base != typedeclNames.end() );
-                        typeInst->set_baseType( base->second->clone() );
+                        typeInst->set_baseType( base->second );
                 } // if
                 return typeInst;

src/SynTree/ReferenceToType.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ReferenceToType.cc -- 
+// ReferenceToType.cc --
 //
 // Author           : Richard C. Bilson
@@ -36 +36 @@
 void ReferenceToType::print( std::ostream &os, int indent ) const {
         using std::endl;
-        
+
         Type::print( os, indent );
         os << "instance of " << typeString() << " " << name << " ";
@@ -128 +128 @@
 }
 
+TypeInstType::~TypeInstType() {
+        // delete baseType; //This is shared and should not be deleted
+}
+
 void TypeInstType::set_baseType( TypeDecl *newValue ) {
         baseType = newValue;
@@ -137 +141 @@
 void TypeInstType::print( std::ostream &os, int indent ) const {
         using std::endl;
-        
+
         Type::print( os, indent );
         os << "instance of " << typeString() << " " << get_name() << " (" << ( isFtype ? "" : "not" ) << " function type) ";

src/SynTree/Type.h

@@ -327 +327 @@
         TypeInstType( const Type::Qualifiers &tq, const std::string &name, bool isFtype );
         TypeInstType( const TypeInstType &other ) : Parent( other ), baseType( other.baseType ), isFtype( other.isFtype ) {}
+        ~TypeInstType();
 
         TypeDecl *get_baseType() const { return baseType; }