Changeset 801978b

Timestamp:

Jul 13, 2021, 12:41:41 PM (4 years ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

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

Children:

ca69a8a

Parents:

37c6f77

Message:

GenPoly? field-number selection for dynamic layouts uses uniqueId to match anonymous fields, rather than accepting first name match. fixed #253?

Files:

• src/GenPoly/Box.cc (modified) (1 diff)
• tests/.expect/polymorphism.txt (modified) (1 diff)
• tests/polymorphism.cfa (modified) (2 diffs)

src/GenPoly/Box.cc

@@ -1546 +1546 @@
                         long i = 0;
                         for(std::list< Declaration* >::const_iterator decl = baseDecls.begin(); decl != baseDecls.end(); ++decl, ++i ) {
-                                if ( memberDecl->get_name() != (*decl)->get_name() ) continue;
-
-                                if ( DeclarationWithType *declWithType = dynamic_cast< DeclarationWithType* >( *decl ) ) {
-                                        if ( memberDecl->get_mangleName().empty() || declWithType->get_mangleName().empty()
-                                             || memberDecl->get_mangleName() == declWithType->get_mangleName() ) return i;
-                                        else continue;
-                                } else return i;
+                                if ( memberDecl->get_name() != (*decl)->get_name() )
+                                        continue;
+
+                                if ( memberDecl->get_name().empty() ) {
+                                        // plan-9 field: match on unique_id
+                                        if ( memberDecl->get_uniqueId() == (*decl)->get_uniqueId() )
+                                                return i;
+                                        else
+                                                continue;
+                                }
+
+                                DeclarationWithType *declWithType = strict_dynamic_cast< DeclarationWithType* >( *decl );
+
+                                if ( memberDecl->get_mangleName().empty() || declWithType->get_mangleName().empty() ) {
+                                        // tuple-element field: expect neither had mangled name; accept match on simple name (like field_2) only
+                                        assert( memberDecl->get_mangleName().empty() && declWithType->get_mangleName().empty() );
+                                        return i;
+                                }
+
+                                // ordinary field: use full name to accommodate overloading
+                                if ( memberDecl->get_mangleName() == declWithType->get_mangleName() )
+                                        return i;
+                                else
+                                        continue;
                         }
                         return -1;

tests/.expect/polymorphism.txt

@@ -1 +1 @@
 123 456 456
 5 5
+=== checkPlan9offsets
+static:
+  offset of inner double: 8
+  offset of inner float:  16
+dynamic:
+  offset of inner double: 8
+  offset of inner float:  16

tests/polymorphism.cfa

@@ -54 +54 @@
         b.i = s.i;
         return b.j;
+}
+
+void checkPlan9offsets() {
+
+        forall( T )
+        struct thing {
+                T q;                // variable-sized padding
+                inline double;
+                inline float;
+        };
+
+        #define SHOW_OFFSETS \
+                double & x_inner_double = x; \
+                float  & x_inner_float  = x; \
+                printf("  offset of inner double: %ld\n", ((char *) & x_inner_double) - ((char *) & x) ); \
+                printf("  offset of inner float:  %ld\n", ((char *) & x_inner_float ) - ((char *) & x) );
+
+        void showStatic( thing(int) & x ) {
+                printf("static:\n");
+                SHOW_OFFSETS
+        }
+
+        forall( T )
+        void showDynamic( thing(T) & x ) {
+                printf("dynamic:\n");
+                SHOW_OFFSETS
+        }
+
+        #undef SHOW_OFFSETS
+
+        printf("=== checkPlan9offsets\n");
+        thing(int) x;
+        showStatic(x);
+        showDynamic(x);
 }
 
@@ -114 +148 @@
                 assertf(ret == u.f2, "union operation fails in polymorphic context.");
         }
+
+        checkPlan9offsets();
 }