Changeset 38093ae for src/InitTweak

Timestamp:

Apr 18, 2024, 8:44:24 PM (3 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

19313be5, cf191ac

Parents:

748c751 (diff), 7a780ad (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:

Resolve conflict

File:

• src/InitTweak/FixInit.cpp (modified) (1 diff)

src/InitTweak/FixInit.cpp

@@ -847 +847 @@
 
                         // static bool __objName_uninitialized = true
-                        auto boolType = new ast::BasicType( ast::BasicType::Kind::Bool );
+                        auto boolType = new ast::BasicType( ast::BasicKind::Bool );
                         auto boolInitExpr = new ast::SingleInit(loc, ast::ConstantExpr::from_int(loc, 1 ) );
                         auto isUninitializedVar = new ast::ObjectDecl(loc, objDecl->mangleName + "_uninitialized", boolType, boolInitExpr, ast::Storage::Static, ast::Linkage::Cforall);