Changeset 1521de20

Timestamp:

Oct 7, 2015, 12:40:53 PM (10 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, string, with_gc

Children:

9909842, f28a53a

Parents:

1cbca6e

Message:

fix segmentation fault in PtrsAssignable?, fix logic error with return value in PtrsCastable?

Location:

src/ResolvExpr

Files:

• CastCost.cc (modified) (3 diffs)
• PtrsAssignable.cc (modified) (2 diffs)
• PtrsCastable.cc (modified) (2 diffs)

src/ResolvExpr/CastCost.cc ¶

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 06:57:43 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May 17 06:59:10 2015
-// Update Count     : 2
+// Last Modified By : Rob Schluntz
+// Last Modified On : Mon Oct 05 14:48:45 2015
+// Update Count     : 5
 //
 
@@ -56 +56 @@
                                 return Cost::infinity;
                         } else {
+                                // xxx - why are we adding cost 0 here?
                                 return converter.get_cost() + Cost( 0, 0, 0 );
                         } // if
@@ -82 +83 @@
                                 newEnv.add( pointerType->get_forall() );
                                 newEnv.add( pointerType->get_base()->get_forall() );
-                                int assignResult = ptrsCastable( pointerType->get_base(), destAsPtr->get_base(), newEnv, indexer );
-                                if ( assignResult > 0 ) {
+                                int castResult = ptrsCastable( pointerType->get_base(), destAsPtr->get_base(), newEnv, indexer );
+                                if ( castResult > 0 ) {
                                         cost = Cost( 0, 0, 1 );
-                                } else if ( assignResult < 0 ) {
+                                } else if ( castResult < 0 ) {
                                         cost = Cost( 1, 0, 0 );
                                 } // if

src/ResolvExpr/PtrsAssignable.cc ¶

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 11:44:11 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May 17 11:47:36 2015
-// Update Count     : 2
+// Last Modified By : Rob Schluntz
+// Last Modified On : Mon Sep 21 14:34:58 2015
+// Update Count     : 7
 //
 
@@ -106 +106 @@
         void PtrsAssignable::visit( TypeInstType *inst ) {
                 EqvClass eqvClass;
-                if ( env.lookup( inst->get_name(), eqvClass ) ) {
+                if ( env.lookup( inst->get_name(), eqvClass ) && eqvClass.type ) {
                         result = ptrsAssignable( eqvClass.type, dest, env );
                 } else {

src/ResolvExpr/PtrsCastable.cc ¶

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 11:48:00 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May 17 11:51:17 2015
-// Update Count     : 2
+// Last Modified By : Rob Schluntz
+// Last Modified On : Mon Oct 05 14:49:12 2015
+// Update Count     : 7
 //
 
@@ -133 +133 @@
 
         void PtrsCastable::visit(TypeInstType *inst) {
-                result = objectCast( inst, env, indexer ) && objectCast( dest, env, indexer ) ? 1 : -1;
+                result = objectCast( inst, env, indexer ) > 0 && objectCast( dest, env, indexer ) > 0 ? 1 : -1;
         }