add a "label" attribute to gcc.GimpleLabel

Commit f695cea updated
gcc.GimpleLabel.__repr__ to lookup the object's "label" attribute, but
this didn't actually exist, causing repr() of a gcc.GimpleLabel to
raise an exception.

Implement the missing attribute

Author: davidmalcolm

docs/gimple.rst

@@ -1,5 +1,5 @@
-.. Copyright 2011, 2012 David Malcolm <[email protected]>
-   Copyright 2011, 2012 Red Hat, Inc.
+.. Copyright 2011, 2012, 2013 David Malcolm <[email protected]>
+   Copyright 2011, 2012, 2013 Red Hat, Inc.
 
    This is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
@@ -346,9 +346,10 @@ Subclass                                 Meaning
 
    Subclass of :py:class:`gcc.Gimple`, representing a "label" statement::
 
-      LABEL:
+   .. py:attribute:: labels
 
-   .. FIXME: Label is a gcc.LabelDecl representing a jump target.
+      The underlying :py:class:`gcc.LabelDecl` node representing this jump
+      target
 
 .. py:class:: gcc.GimpleAssign
 

gcc-c-api/gcc-gimple.c

@@ -1,6 +1,6 @@
 /*
-   Copyright 2012 David Malcolm <[email protected]>
-   Copyright 2012 Red Hat, Inc.
+   Copyright 2012, 2013 David Malcolm <[email protected]>
+   Copyright 2012, 2013 Red Hat, Inc.
 
    This is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@
 */
 
 #include "gcc-gimple.h"
+#include "gcc-tree.h"
 #include "gcc-internal.h"
 
 //#include "tree.h"
@@ -252,6 +253,15 @@ gcc_gimple_switch_for_each_label (gcc_gimple_switch stmt,
   return false;
 }
 
+/***************************************************************************
+ gcc_gimple_label
+ **************************************************************************/
+GCC_IMPLEMENT_PUBLIC_API(gcc_label_decl)
+gcc_gimple_label_get_label(gcc_gimple_label stmt)
+{
+  return gcc_tree_as_gcc_label_decl (gcc_private_make_tree (gimple_label_label (stmt.inner)));
+}
+
 /*
 Local variables:
 c-basic-offset: 2

gcc-c-api/gimple.xml

@@ -103,5 +103,11 @@
       <doc>The labels of the switch statement.  The initial label in the list is always the default.</doc>
     </iterator>
   </type>
+
+  <type name="gimple_label" base="gimple">
+    <attribute name="label" kind="label_decl">
+      <doc>The underlying label_decl for this statement</doc>
+    </attribute>
+  </type>
 
 </api>

gcc-python-gimple.c

@@ -70,6 +70,12 @@ PyGccGimple_as_gcc_gimple_switch(struct PyGccGimple *self)
     return gcc_gimple_as_gcc_gimple_switch(self->stmt);
 }
 
+gcc_gimple_label
+PyGccGimple_as_gcc_gimple_label(struct PyGccGimple *self)
+{
+    return gcc_gimple_as_gcc_gimple_label(self->stmt);
+}
+
 static PyObject *
 do_pretty_print(struct PyGccGimple * self, int spc, int flags)
 {

gcc-python-wrappers.h

@@ -1,6 +1,6 @@
 /*
-   Copyright 2011, 2012 David Malcolm <[email protected]>
-   Copyright 2011, 2012 Red Hat, Inc.
+   Copyright 2011, 2012, 2013 David Malcolm <[email protected]>
+   Copyright 2011, 2012, 2013 Red Hat, Inc.
 
    This is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
@@ -333,6 +333,9 @@ PyGccGimple_as_gcc_gimple_phi(struct PyGccGimple *self);
 extern gcc_gimple_switch
 PyGccGimple_as_gcc_gimple_switch(struct PyGccGimple *self);
 
+extern gcc_gimple_label
+PyGccGimple_as_gcc_gimple_label(struct PyGccGimple *self);
+
 PyObject *
 PyGccGimple_repr(struct PyGccGimple * self);
 

generate-gimple-c.py

@@ -1,5 +1,5 @@
-#   Copyright 2011, 2012 David Malcolm <[email protected]>
-#   Copyright 2011, 2012 Red Hat, Inc.
+#   Copyright 2011, 2012, 2013 David Malcolm <[email protected]>
+#   Copyright 2011, 2012, 2013 Red Hat, Inc.
 #
 #   This is free software: you can redistribute it and/or modify it
 #   under the terms of the GNU General Public License as published by
@@ -26,6 +26,7 @@
 cu.add_include('gcc-plugin.h')
 cu.add_include("gimple.h")
 cu.add_include("gcc-c-api/gcc-gimple.h")
+cu.add_include("gcc-c-api/gcc-declaration.h")
 
 modinit_preinit = ''
 modinit_postinit = ''
@@ -383,6 +384,17 @@ def make_getset_Switch():
                               'Get a list of labels, as a list of gcc.CaseLabelExpr   The initial label in the list is always the default.')
         return getsettable
 
+    def make_getset_Label():
+        getsettable = PyGetSetDefTable('gcc_%s_getset_table' % cc,
+                                       [exprcode_getter],
+                                       'PyGccGimpleLabel',
+                                       'PyGccGimple')
+        getsettable.add_simple_getter(cu,
+                                      'label',
+                                      'PyGccTree_New(gcc_label_decl_as_gcc_tree(gcc_gimple_label_get_label(PyGccGimple_as_gcc_gimple_label(self))))',
+                                      'Get the underlying gcc.LabelDecl for this statement')
+        return getsettable
+
     for gt in gimple_types:
         cc = gt.camel_cased_string()
 
@@ -403,6 +415,7 @@ def make_getset_Switch():
         elif cc == 'GimpleSwitch':
             getsettable = make_getset_Switch()
         elif cc == 'GimpleLabel':
+            getsettable = make_getset_Label()
             tp_repr = '(reprfunc)PyGccGimpleLabel_repr'
 
         if getsettable: