Changeset b91bfde for src/Virtual

Timestamp:

Apr 12, 2021, 11:53:30 AM (2 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

arm-eh, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

73f4d08

Parents:

ecfd758

Message:

Added and used some helpers. The widely useful one is a from_string helper for constants.

Location:

src/Virtual

Files:

• ExpandCasts.cc (modified) (3 diffs)
• Tables.cc (modified) (1 diff)

src/Virtual/ExpandCasts.cc

@@ -77 +77 @@
 
         class VirtualCastCore {
-                Type * pointer_to_pvt(int level_of_indirection) {
+                CastExpr * cast_to_type_id( Expression * expr, int level_of_indirection ) {
                         Type * type = new StructInstType(
                                 Type::Qualifiers( Type::Const ), pvt_decl );
@@ -83 +83 @@
                                 type = new PointerType( noQualifiers, type );
                         }
-                        return type;
+                        return new CastExpr( expr, type );
                 }
 
@@ -253 +253 @@
                 Expression * result = new CastExpr(
                         new ApplicationExpr( VariableExpr::functionPointer( vcast_decl ), {
-                                        new CastExpr(
-                                                new AddressExpr( new VariableExpr( type_id ) ),
-                                                pointer_to_pvt(1)
-                                        ),
-                                        new CastExpr(
-                                                castExpr->get_arg(),
-                                                pointer_to_pvt(2)
-                                        )
+                                cast_to_type_id( new AddressExpr( new VariableExpr( type_id ) ), 1 ),
+                                cast_to_type_id( castExpr->get_arg(), 2 ),
                         } ),
                         castExpr->get_result()->clone()

src/Virtual/Tables.cc

@@ -172 +172 @@
 
 Attribute * linkonce( const std::string & subsection ) {
-        const std::string section = "\".gnu.linkonce." + subsection + "\"";
-        // Adjust for terminator and quotes.
-        size_t str_size = section.size() + 1 - 2;
+        const std::string section = ".gnu.linkonce." + subsection;
         return new Attribute( "section", {
-                new ConstantExpr( Constant(
-                        new ArrayType(
-                                noQualifiers,
-                                new BasicType( noQualifiers, BasicType::Char ),
-                                new ConstantExpr( Constant::from_ulong( str_size ) ),
-                                false, false ),
-                        section,
-                        std::nullopt
-                ) ),
+                new ConstantExpr( Constant::from_string( section ) ),
         } );
 }