Changeset fea7ca7 for src/GenPoly/Specialize.cc

Timestamp:

Apr 29, 2016, 12:26:50 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, with_gc

Children:

d8ba086

Parents:

a0fdbd5

Message:

Account for lvalue returning functions in FixCopyCtor?, removed ConditionalExpr?, CommaExpr?, Logical Expr mutates from Specialize, added before box debug flag

File:

• src/GenPoly/Specialize.cc (modified) (3 diffs)

src/GenPoly/Specialize.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jan 20 13:00:00 2016
+// Last Modified On : Thu Apr 28 15:17:45 2016
 // Update Count     : 24
 //
@@ -41 +41 @@
                 virtual Expression * mutate( AddressExpr *castExpr );
                 virtual Expression * mutate( CastExpr *castExpr );
-                virtual Expression * mutate( LogicalExpr *logicalExpr );
-                virtual Expression * mutate( ConditionalExpr *conditionalExpr );
-                virtual Expression * mutate( CommaExpr *commaExpr );
+                // virtual Expression * mutate( LogicalExpr *logicalExpr );
+                // virtual Expression * mutate( ConditionalExpr *conditionalExpr );
+                // virtual Expression * mutate( CommaExpr *commaExpr );
 
           private:
@@ -212 +212 @@
         }
 
-        Expression * Specialize::mutate( LogicalExpr *logicalExpr ) {
-                return logicalExpr;
-        }
-
-        Expression * Specialize::mutate( ConditionalExpr *condExpr ) {
-                return condExpr;
-        }
-
-        Expression * Specialize::mutate( CommaExpr *commaExpr ) {
-                return commaExpr;
-        }
+        // Removing these for now. Richard put these in for some reason, but it's not clear why.
+        // In particular, copy constructors produce a comma expression, and with this code the parts
+        // of that comma expression are not specialized, which causes problems.
+
+        // Expression * Specialize::mutate( LogicalExpr *logicalExpr ) {
+        //      return logicalExpr;
+        // }
+
+        // Expression * Specialize::mutate( ConditionalExpr *condExpr ) {
+        //      return condExpr;
+        // }
+
+        // Expression * Specialize::mutate( CommaExpr *commaExpr ) {
+        //      return commaExpr;
+        // }
 } // namespace GenPoly