Changeset 32cab5b for src/Common

Timestamp:

Apr 17, 2018, 12:01:09 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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, with_gc

Children:

3265399

Parents:

b2fe1c9 (diff), 81bb114 (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:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/Common

Files:

• Debug.h (modified) (1 diff)
• ErrorObjects.h (modified) (1 diff)
• PassVisitor.h (modified) (2 diffs)
• PassVisitor.impl.h (modified) (3 diffs)
• SemanticError.h (modified) (2 diffs)

src/Common/Debug.h

@@ -28 +28 @@
 namespace Debug {
         /// debug codegen a translation unit
-        static inline void codeGen( __attribute__((unused)) const std::list< Declaration * > & translationUnit, __attribute__((unused)) const std::string & label ) {
+        static inline void codeGen( __attribute__((unused)) const std::list< Declaration * > & translationUnit, __attribute__((unused)) const std::string & label, __attribute__((unused)) LinkageSpec::Spec linkageFilter = LinkageSpec::Compiler ) {
         #ifdef DEBUG
                 std::list< Declaration * > decls;
 
-                filter( translationUnit.begin(), translationUnit.end(), back_inserter( decls ), []( Declaration * decl ) {
-                        return ! LinkageSpec::isBuiltin( decl->get_linkage() );
+                filter( translationUnit.begin(), translationUnit.end(), back_inserter( decls ), [linkageFilter]( Declaration * decl ) {
+                        return ! (decl->linkage & linkageFilter);
                 });
 
                 std::cerr << "======" << label << "======" << std::endl;
-                CodeGen::generate( decls, std::cerr, false, true );
+                CodeGen::generate( decls, std::cerr, true, true );
         #endif
         } // dump
 
-        static inline void treeDump( __attribute__((unused)) const std::list< Declaration * > & translationUnit, __attribute__((unused)) const std::string & label ) {
+        static inline void treeDump( __attribute__((unused)) const std::list< Declaration * > & translationUnit, __attribute__((unused)) const std::string & label, __attribute__((unused)) LinkageSpec::Spec linkageFilter = LinkageSpec::Compiler ) {
         #ifdef DEBUG
                 std::list< Declaration * > decls;
 
-                filter( translationUnit.begin(), translationUnit.end(), back_inserter( decls ), []( Declaration * decl ) {
-                        return ! LinkageSpec::isBuiltin( decl->get_linkage() );
+                filter( translationUnit.begin(), translationUnit.end(), back_inserter( decls ), [linkageFilter]( Declaration * decl ) {
+                        return ! (decl->linkage & linkageFilter);
                 });
 

src/Common/ErrorObjects.h

@@ -35 +35 @@
 class SemanticErrorException : public std::exception {
   public:
-        SemanticErrorException() = default;
+        SemanticErrorException() = default;
         SemanticErrorException( CodeLocation location, std::string error );
         ~SemanticErrorException() throw() {}

src/Common/PassVisitor.h

@@ -66 +66 @@
         virtual void visit( TypedefDecl * typeDecl ) override final;
         virtual void visit( AsmDecl * asmDecl ) override final;
+        virtual void visit( StaticAssertDecl * assertDecl ) override final;
 
         virtual void visit( CompoundStmt * compoundStmt ) override final;
@@ -161 +162 @@
         virtual Declaration * mutate( TypedefDecl * typeDecl ) override final;
         virtual AsmDecl * mutate( AsmDecl * asmDecl ) override final;
+        virtual StaticAssertDecl * mutate( StaticAssertDecl * assertDecl ) override final;
 
         virtual CompoundStmt * mutate( CompoundStmt * compoundStmt ) override final;

src/Common/PassVisitor.impl.h

@@ -685 +685 @@
 
 //--------------------------------------------------------------------------
+// StaticAssertDecl
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( StaticAssertDecl * node ) {
+        VISIT_START( node );
+
+        maybeAccept_impl( node->condition, *this );
+        maybeAccept_impl( node->message  , *this );
+
+        VISIT_END( node );
+}
+
+template< typename pass_type >
+StaticAssertDecl * PassVisitor< pass_type >::mutate( StaticAssertDecl * node ) {
+        MUTATE_START( node );
+
+        maybeMutate_impl( node->condition, *this );
+        maybeMutate_impl( node->message  , *this );
+
+        MUTATE_END( StaticAssertDecl, node );
+}
+
+//--------------------------------------------------------------------------
 // CompoundStmt
 template< typename pass_type >
@@ -1490 +1512 @@
         indexerScopedAccept( node->result, *this );
         maybeAccept_impl   ( node->type  , *this );
-        maybeAccept_impl   ( node->member, *this );
 
         VISIT_END( node );
@@ -1502 +1523 @@
         indexerScopedMutate( node->result, *this );
         maybeMutate_impl   ( node->type  , *this );
-        maybeMutate_impl   ( node->member, *this );
 
         MUTATE_END( Expression, node );

src/Common/SemanticError.h

@@ -38 +38 @@
 constexpr const char * const WarningFormats[] = {
         "self assignment of expression: %s",
+        "rvalue to reference conversion of rvalue: %s",
 };
 
 enum class Warning {
         SelfAssignment,
+        RvalueToReferenceConversion,
         NUMBER_OF_WARNINGS, //This MUST be the last warning
 };
@@ -50 +52 @@
 );
 
-#define SemanticWarning(loc, id, ...) SemanticWarningImpl(loc, id, WarningFormats[(int)id], __VA_ARGS__)
+// ## used here to allow empty __VA_ARGS__
+#define SemanticWarning(loc, id, ...) SemanticWarningImpl(loc, id, WarningFormats[(int)id], ## __VA_ARGS__)
 
 void SemanticWarningImpl (CodeLocation loc, Warning warn, const char * const fmt, ...) __attribute__((format(printf, 3, 4)));