Changeset 5af7306 for src/ResolvExpr

Timestamp:

Apr 23, 2018, 4:46:43 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

2efe4b8

Parents:

fb97252f

Message:

Assorted bug fixes

Location:

src/ResolvExpr

Files:

• AlternativeFinder.cc (modified) (1 diff)
• ConversionCost.cc (modified) (2 diffs)

src/ResolvExpr/AlternativeFinder.cc

@@ -1082 +1082 @@
                 AlternativeFinder funcOpFinder( indexer, env );
                 // it's ok if there aren't any defined function ops
-                funcOpFinder.maybeFind( opExpr);
+                funcOpFinder.maybeFind( opExpr );
                 PRINT(
                         std::cerr << "known function ops:" << std::endl;

src/ResolvExpr/ConversionCost.cc

@@ -20 +20 @@
 #include <string>                        // for operator==, string
 
+#include "Common/GC.h"                   // for new_static_root
 #include "ResolvExpr/Cost.h"             // for Cost
 #include "ResolvExpr/TypeEnvironment.h"  // for EqvClass, TypeEnvironment
@@ -353 +354 @@
         void ConversionCost::postvisit( EnumInstType * ) {
                 static Type::Qualifiers q;
-                static BasicType integer( q, BasicType::SignedInt );
-                cost = costFunc( &integer, dest, indexer, env );  // safe if dest >= int
+                static BasicType* integer = new_static_root<BasicType>( q, BasicType::SignedInt );
+                cost = costFunc( integer, dest, indexer, env );  // safe if dest >= int
                 if ( cost < Cost::unsafe ) {
                         cost.incSafe();