Changeset 5809461 for src/SynTree

Timestamp:

Sep 1, 2017, 6:59:48 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:

b0dfbc4

Parents:

bc3127d

Message:

Fix handling of GCC label address and computed goto

Location:

src/SynTree

Files:

• AddressExpr.cc (modified) (1 diff)
• Expression.h (modified) (2 diffs)
• Mutator.cc (modified) (1 diff)
• Visitor.cc (modified) (1 diff)

src/SynTree/AddressExpr.cc

@@ -70 +70 @@
 }
 
+LabelAddressExpr::LabelAddressExpr( const Label &arg ) : arg( arg ) {
+        // label address always has type void *
+        result = new PointerType( Type::Qualifiers(), new VoidType( Type::Qualifiers() ) );
+}
+LabelAddressExpr::LabelAddressExpr( const LabelAddressExpr & other ) : Expression( other ), arg( other.arg ) {}
+LabelAddressExpr::~LabelAddressExpr() {}
+
+void LabelAddressExpr::print( std::ostream & os, int indent ) const {
+        os << "Address of label:" << std::endl << std::string( indent+2, ' ' ) << arg;
+}
+
 // Local Variables: //
 // tab-width: 4 //

src/SynTree/Expression.h

@@ -24 +24 @@
 #include "Constant.h"             // for Constant
 #include "Initializer.h"          // for Designation (ptr only), Initializer
+#include "Label.h"                // for Label
 #include "Mutator.h"              // for Mutator
 #include "SynTree.h"              // for UniqueId
@@ -173 +174 @@
 };
 
-// xxx - this doesn't appear to actually be hooked in anywhere. We should use this instead of the "&&"" UntypedExpr hack
+// GCC &&label
+// https://gcc.gnu.org/onlinedocs/gcc-3.4.2/gcc/Labels-as-Values.html
 class LabelAddressExpr : public Expression {
   public:
-        Expression * arg;
-
-        LabelAddressExpr( Expression * arg );
+        Label arg;
+
+        LabelAddressExpr( const Label &arg );
         LabelAddressExpr( const LabelAddressExpr & other );
         virtual ~LabelAddressExpr();
-
-        Expression * get_arg() const { return arg; }
-        void set_arg(Expression * newValue ) { arg = newValue; }
 
         virtual LabelAddressExpr * clone() const { return new LabelAddressExpr( * this ); }

src/SynTree/Mutator.cc

@@ -246 +246 @@
         labelAddressExpr->set_env( maybeMutate( labelAddressExpr->get_env(), *this ) );
         labelAddressExpr->set_result( maybeMutate( labelAddressExpr->get_result(), *this ) );
-        labelAddressExpr->set_arg( maybeMutate( labelAddressExpr->get_arg(), *this ) );
         return labelAddressExpr;
 }

src/SynTree/Visitor.cc

@@ -205 +205 @@
 void Visitor::visit( LabelAddressExpr *labAddressExpr ) {
         maybeAccept( labAddressExpr->get_result(), *this );
-        maybeAccept( labAddressExpr->get_arg(), *this );
 }