Changeset 496ffc17 for src

Timestamp:

Feb 1, 2024, 5:05:54 PM (12 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

9ddcee1

Parents:

32490deb

Message:

Fix dangling reference to posE function

Location:

src

Files:

• ResolvExpr/CandidateFinder.cpp (modified) (1 diff)
• Validate/Autogen.cpp (modified) (1 diff)
• Validate/ReplacePseudoFunc.cpp (modified) (2 diffs)

src/ResolvExpr/CandidateFinder.cpp

@@ -1403 +1403 @@
                 // not sufficient to just pass `variableExpr` here, type might have changed since
                 // creation
-                if ( auto obj =  dynamic_cast<const ast::ObjectDecl *>( variableExpr->var.get() )) {
+                if ( auto obj = dynamic_cast<const ast::ObjectDecl *>( variableExpr->var.get() )) {
                         if ( auto enumInstType = dynamic_cast<const ast::EnumInstType *>( obj->type.get() ) ) {
                                 if ( enumInstType->base && enumInstType->base->base ) {

src/Validate/Autogen.cpp

@@ -751 +751 @@
                  * returns to zero.
                  */
-                auto dstExpr = new ast::VariableExpr( location, dstParam );
-                const ast::Expr * srcExpr;
-                if ( decl->base ) {
-                        srcExpr = new ast::ApplicationExpr( location,
-                        ast::VariableExpr::functionPointer( location, genPosProto() ), 
-                        {
-                                new ast::VariableExpr( location, srcParam )
-                        }
-                        );
-                } else {
-                        srcExpr = new ast::VariableExpr( location, srcParam );
-                }
-
                 auto callExpr = new ast::ApplicationExpr( location,
                         ast::VariableExpr::functionPointer( location, functionDecl ),
                         {
-                                dstExpr,
-                                srcExpr,
+                                new ast::VariableExpr( location, dstParam ),
+                                new ast::VariableExpr( location, srcParam )
                         }
                 );

src/Validate/ReplacePseudoFunc.cpp

@@ -128 +128 @@
             location, ast::ConstantExpr::from_string(location, mem->name)));
     }
-    // Values only
     if (queryValues.count(enumDecl->name)) {
         auto init = new ast::ListInit(location, std::move(inits));
@@ -166 +165 @@
     auto untyped = new ast::UntypedExpr(
         location, new ast::NameExpr(location, "?[?]"),
-        {new ast::VariableExpr(*arrAsVar), new ast::VariableExpr(*arg)});
+        { std::move(arrAsVar), std::move(arg) });
     auto typedResult = ResolvExpr::findVoidExpression(untyped, context);