Changeset 2b79a70

Timestamp:

Aug 21, 2018, 2:21:53 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

cdbab55

Parents:

51fcdbc7

git-author:

Rob Schluntz <rschlunt@…> (08/21/18 13:23:01)

git-committer:

Rob Schluntz <rschlunt@…> (08/21/18 14:21:53)

Message:

Resolve typeof earlier so that constructors are chosen appropriately [fixes #102]

Location:

src

Files:

• ResolvExpr/Resolver.cc (modified) (5 diffs)
• SymTab/Validate.cc (modified) (4 diffs)
• tests/.expect/gccExtensions.x64.txt (modified) (1 diff)
• tests/.expect/gccExtensions.x86.txt (modified) (1 diff)

src/ResolvExpr/Resolver.cc ¶

@@ -30 +30 @@
 #include "RenameVars.h"                  // for RenameVars, global_renamer
 #include "ResolvExpr/TypeEnvironment.h"  // for TypeEnvironment
-#include "ResolveTypeof.h"               // for resolveTypeof
 #include "Resolver.h"
 #include "SymTab/Autogen.h"              // for SizeType
@@ -57 +56 @@
                 void postvisit( FunctionDecl *functionDecl );
                 void previsit( ObjectDecl *objectDecll );
-                void previsit( TypeDecl *typeDecl );
                 void previsit( EnumDecl * enumDecl );
                 void previsit( StaticAssertDecl * assertDecl );
@@ -303 +301 @@
 
         void Resolver::previsit( ObjectDecl *objectDecl ) {
-                Type *new_type = resolveTypeof( objectDecl->get_type(), indexer );
-                new_type->get_qualifiers() -= Type::Lvalue; // even if typeof is lvalue, variable can never have lvalue-qualified type
-                objectDecl->set_type( new_type );
                 // To handle initialization of routine pointers, e.g., int (*fp)(int) = foo(), means that class-variable
                 // initContext is changed multiple time because the LHS is analysed twice. The second analysis changes
@@ -335 +330 @@
         }
 
-        void Resolver::previsit( TypeDecl *typeDecl ) {
-                if ( typeDecl->get_base() ) {
-                        Type *new_type = resolveTypeof( typeDecl->get_base(), indexer );
-                        typeDecl->set_base( new_type );
-                } // if
-        }
-
         void Resolver::previsit( FunctionDecl *functionDecl ) {
 #if 0
@@ -348 +336 @@
                 std::cerr << std::endl;
 #endif
-                Type *new_type = resolveTypeof( functionDecl->type, indexer );
-                functionDecl->set_type( new_type );
                 GuardValue( functionReturn );
                 functionReturn = ResolvExpr::extractResultType( functionDecl->type );

src/SymTab/Validate.cc ¶

@@ -62 +62 @@
 #include "ResolvExpr/typeops.h"        // for typesCompatible
 #include "ResolvExpr/Resolver.h"       // for findSingleExpression
+#include "ResolvExpr/ResolveTypeof.h"  // for resolveTypeof
 #include "SymTab/Autogen.h"            // for SizeType
 #include "SynTree/Attribute.h"         // for noAttributes, Attribute
@@ -247 +248 @@
                 void previsit( StructInstType * inst );
                 void previsit( UnionInstType * inst );
+        };
+
+        struct FixObjectType : public WithIndexer {
+                /// resolves typeof type in object, function, and type declarations
+                static void fix( std::list< Declaration * > & translationUnit );
+
+                void previsit( ObjectDecl * );
+                void previsit( FunctionDecl * );
+                void previsit( TypeDecl * );
         };
 
@@ -312 +322 @@
                 Concurrency::implementThreadStarter( translationUnit );
                 mutateAll( translationUnit, compoundliteral );
+                FixObjectType::fix( translationUnit );
                 ArrayLength::computeLength( translationUnit );
                 acceptAll( translationUnit, finder ); // xxx - remove this pass soon
@@ -1238 +1249 @@
         }
 
+        void FixObjectType::fix( std::list< Declaration * > & translationUnit ) {
+                PassVisitor<FixObjectType> fixer;
+                acceptAll( translationUnit, fixer );
+        }
+
+        void FixObjectType::previsit( ObjectDecl * objDecl ) {
+                Type *new_type = ResolvExpr::resolveTypeof( objDecl->get_type(), indexer );
+                new_type->get_qualifiers() -= Type::Lvalue; // even if typeof is lvalue, variable can never have lvalue-qualified type
+                objDecl->set_type( new_type );
+        }
+
+        void FixObjectType::previsit( FunctionDecl * funcDecl ) {
+                Type *new_type = ResolvExpr::resolveTypeof( funcDecl->type, indexer );
+                new_type->get_qualifiers() -= Type::Lvalue; // even if typeof is lvalue, variable can never have lvalue-qualified type
+                funcDecl->set_type( new_type );
+        }
+
+        void FixObjectType::previsit( TypeDecl *typeDecl ) {
+                if ( typeDecl->get_base() ) {
+                        Type *new_type = ResolvExpr::resolveTypeof( typeDecl->get_base(), indexer );
+                        new_type->get_qualifiers() -= Type::Lvalue; // even if typeof is lvalue, variable can never have lvalue-qualified type
+                        typeDecl->set_base( new_type );
+                } // if
+        }
+
         void ArrayLength::computeLength( std::list< Declaration * > & translationUnit ) {
                 PassVisitor<ArrayLength> len;

src/tests/.expect/gccExtensions.x64.txt ¶

@@ -29 +29 @@
     volatile signed int __v1__Vi_2;
     volatile signed int __v2__Vi_2;
-    signed int __t1___2;
-    signed int __t2___2;
+    signed int __t1__i_2;
+    signed int __t2__i_2;
     __extension__ const signed int __ex__Ci_2;
     struct S {

src/tests/.expect/gccExtensions.x86.txt ¶

@@ -29 +29 @@
     volatile signed int __v1__Vi_2;
     volatile signed int __v2__Vi_2;
-    signed int __t1___2;
-    signed int __t2___2;
+    signed int __t1__i_2;
+    signed int __t2__i_2;
     __extension__ const signed int __ex__Ci_2;
     struct S {