2014-09-02 Basile Starynkevitch <basile@starynkevitch.net>

	* melt-runtime.h (MELT_VERSION_STRING): Bump to 1.1.2post.
	* melt/libmelt-ana-base.melt (each_cgraph_fun_call_flow_graph):
	Test #if MELT_GCC_VERSION >= 4009, not == 4009....
	* melt/libmelt-ana-tree.melt (tree_type_canonical): New cmatcher.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@214812 138bc75d-0d04-0410-961f-82ee72b054a4

5 files changed, 26 insertions, 6 deletions

diff --git a/gcc/ChangeLog.MELT b/gcc/ChangeLog.MELT
index 620291c8307..f36eedc953e 100644
--- a/gcc/ChangeLog.MELT
+++ b/gcc/ChangeLog.MELT
@@ -1,4 +1,10 @@
 
+2014-09-02  Basile Starynkevitch  <basile@starynkevitch.net>
+	* melt-runtime.h (MELT_VERSION_STRING): Bump to 1.1.2post.
+	* melt/libmelt-ana-base.melt (each_cgraph_fun_call_flow_graph):
+	Test #if MELT_GCC_VERSION >= 4009, not == 4009....
+	* melt/libmelt-ana-tree.melt (tree_type_canonical): New cmatcher.
+
 2014-08-31  Basile Starynkevitch  <basile@starynkevitch.net>
 	{{MELT 1.1.2 release for GCC 4.8 & 4.9}}
 	* melt-runtime.h (MELT_VERSION_STRING): Bump to 1.1.2.
diff --git a/gcc/melt-build-script.sh b/gcc/melt-build-script.sh
index 3fad311bc00..f6c7ab925a2 100644
--- a/gcc/melt-build-script.sh
+++ b/gcc/melt-build-script.sh
@@ -3,7 +3,7 @@
 #@#@#
 #@#@# DO NOT EDIT THIS FILE   (melt-build-script.sh)
 #@#@#
-#@#@# It has been AutoGen-ed  August 31, 2014 at 11:44:24 AM by AutoGen 5.18.3
+#@#@# It has been AutoGen-ed  September  2, 2014 at 12:54:49 PM by AutoGen 5.18.3
 #@#@# From the definitions    melt-build-script.def
 #@#@# and the template file   melt-build-script.tpl
 # Generated shell script for MELT modules and MELT translator bootstrap
diff --git a/gcc/melt-runtime.h b/gcc/melt-runtime.h
index 8d2b97d58e6..9a547083795 100644
--- a/gcc/melt-runtime.h
+++ b/gcc/melt-runtime.h
@@ -142,7 +142,7 @@ MELT_EXTERN int melt_count_runtime_extensions;
 /* The version string of MELT; this is parsed by make, so spaces are
    important, don't add spaces after the terminating double-quote!
    That version string is extracted by scripts or makefiles... */
-#define MELT_VERSION_STRING "1.1.2"
+#define MELT_VERSION_STRING "1.1.2post"
 
 /* return a read only version string */
 extern const char* melt_version_str(void);
diff --git a/gcc/melt/libmelt-ana-base.melt b/gcc/melt/libmelt-ana-base.melt
index 115547ad672..87509e98ddf 100644
--- a/gcc/melt/libmelt-ana-base.melt
+++ b/gcc/melt/libmelt-ana-base.melt
@@ -1339,7 +1339,7 @@ unsigned int melthk_rtl_execute(void)
       for ($EACHCGRAFUNCFG#_ix = 0;
 	   $EACHCGRAFUNCFG#_ix < $EACHCGRAFUNCFG#_n_bb;
 	   $EACHCGRAFUNCFG#_ix ++) {
-#if  MELT_GCC_VERSION == 4009
+#if  MELT_GCC_VERSION >= 4009
            $EACHCGRAFUNCFG#_curbb =
               BASIC_BLOCK_FOR_FN ($EACHCGRAFUNCFG#_fun,
 				  $EACHCGRAFUNCFG#_ix);
diff --git a/gcc/melt/libmelt-ana-tree.melt b/gcc/melt/libmelt-ana-tree.melt
index ec870ddc07c..baadf90bc73 100644
--- a/gcc/melt/libmelt-ana-tree.melt
+++ b/gcc/melt/libmelt-ana-tree.melt
@@ -1124,11 +1124,24 @@
   treetypet
   :doc #{$TREE_TYPE_P match a type tree $TR and extract the inside type $TYPETR}#
   ;; test
-  #{ /*tree_type_p $TREETYPET ?*/ (($TR) && TYPE_P(($tr))) }#
+  #{ /*tree_type_p $TREETYPET ?*/ (($TR) && TYPE_P(($TR))) }#
   ;; fill
-  #{ /*tree_type_p $TREETYPET !*/ $TYPETR = TREE_TYPE($tr); }#
+  #{ /*tree_type_p $TREETYPET !*/ $TYPETR = TREE_TYPE($TR); }#
 )
 
+(defcmatcher tree_type_canonical
+  (:tree tr)
+  (:tree trcan)
+  treetypcanon
+  :doc #{$TREE_TYPE_CANONICAL match a type tree $TR and extract its canonical type.}#
+  ;; test expansion
+  #{ /* tree_type_canonical $TREETYPCANON ? */ (($TR) && TYPE_P(($TR))) }#
+  ;; fill expansion
+  #{ /* tree_type_canonical $TREETYPCANON ! */
+    $TRCAN = TYPE_CANONICAL($TR);
+  }#)
+  
+  
 ;;; pattern for pointer types (or reference type)
 (defcmatcher tree_pointer_type_p
   (:tree tr)
@@ -2305,7 +2318,8 @@ melt_pragma_process_callback (struct cpp_reader* ATTRIBUTE_UNUSED, void* data)
  tree_ssa_name 
  tree_string_cst
  tree_type   
- tree_type_addr_space 
+ tree_type_addr_space
+ tree_type_canonical
  tree_type_decl
  tree_type_decl_named
  tree_type_declaration