Changeset 23c4aa8 for src

Timestamp:

Feb 24, 2017, 3:23:59 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

167a9c8, 356c62a

Parents:

255b294

Message:

fix constructor transitivity rule

Location:

src

Files:

• InitTweak/GenInit.cc (modified) (1 diff)
• tests/.expect/globals.txt (modified) (1 diff)
• tests/globals.c (modified) (1 diff)
• tests/simpleGenericTriple.c (modified) (1 diff)

src/InitTweak/GenInit.cc

@@ -332 +332 @@
                         if ( ObjectDecl * field = dynamic_cast< ObjectDecl * >( member ) ) {
                                 if ( isManaged( field ) ) {
-                                        managedTypes.insert( SymTab::Mangler::mangle( aggregateDecl ) );
+                                        StructInstType inst( Type::Qualifiers(), aggregateDecl );
+                                        managedTypes.insert( SymTab::Mangler::mangle( &inst ) );
                                         break;
                                 }

src/tests/.expect/globals.txt

@@ -1 @@
-static  inline  autogen value
+static          inline          autogen         value
 no              no              no              22
 no              no              yes             22

src/tests/globals.c

@@ -70 +70 @@
 
 int main() {
-        sout | "static\tinline\tautogen\tvalue" | endl;
+        sout | "static\t\tinline\t\tautogen\t\tvalue" | endl;
 
         sout | "no \t\tno \t\tno \t\t" | g.val.value    | endl;

src/tests/simpleGenericTriple.c

@@ -28 +28 @@
   int x1 = 123, x3 = 456;
   double x2 = 999.123;
-  struct T3(int) Li = { x1, x2, x3 };
+  struct T3(int) Li = { x1, (int)x2, x3 };
   struct T3(int) Ri = { 9, 2, 3 };
   struct T3(int) reti = Li+Ri;