Changeset 24d6572 for src/Validate/ReplaceTypedef.cpp

Timestamp:

Jun 12, 2023, 2:45:32 PM (2 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

ast-experimental, master

Children:

62d62db

Parents:

34b4268 (diff), 251ce80 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into ast-experimental

File:

• src/Validate/ReplaceTypedef.cpp (modified) (3 diffs)

src/Validate/ReplaceTypedef.cpp

@@ -16 +16 @@
 #include "ReplaceTypedef.hpp"
 
+#include "AST/Copy.hpp"
 #include "AST/Pass.hpp"
 #include "Common/ScopedMap.h"
 #include "Common/UniqueName.h"
 #include "Common/utility.h"
-#include "ResolvExpr/typeops.h"
+#include "ResolvExpr/Unify.h"
 
 namespace Validate {
@@ -149 +150 @@
                 // constant/enumerator. The effort required to fix this corner case
                 // likely outweighs the utility of allowing it.
-                if ( !ResolvExpr::typesCompatible( t0, t1, ast::SymbolTable() )
+                if ( !ResolvExpr::typesCompatible( t0, t1 )
                                 || ast::Pass<VarLenChecker>::read( t0 )
                                 || ast::Pass<VarLenChecker>::read( t1 ) ) {
@@ -186 +187 @@
 
 void ReplaceTypedefCore::previsit( ast::TypeDecl const * decl ) {
-        TypedefMap::iterator iter = typedefNames.find( decl->name );
-        if ( iter != typedefNames.end() ) {
-                typedefNames.erase( iter );
-        }
+        typedefNames.erase( decl->name );
         typedeclNames.insert( decl->name, decl );
 }