Merger of git branch "gimple-classes-v2-option-3"

[thirdparty/gcc.git] / gcc / cgraphunit.c

diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c
index e380e841dfdd60d6c37961c9c25f4c887279ba51..2fd99a7c09840d5238b68ae91c05eaba7db5674f 100644 (file)
--- a/gcc/cgraphunit.c
+++ b/gcc/cgraphunit.c
@@ -1340,7 +1340,7 @@ thunk_adjust (gimple_stmt_iterator * bsi,
              tree ptr, bool this_adjusting,
              HOST_WIDE_INT fixed_offset, tree virtual_offset)
 {
-  gimple stmt;
+  gassign *stmt;
   tree ret;
 
   if (this_adjusting
@@ -1516,8 +1516,8 @@ cgraph_node::expand_thunk (bool output_asm_thunks, bool force_gimple_thunk)
       tree resdecl;
       tree restmp = NULL;
 
-      gimple call;
-      gimple ret;
+      gcall *call;
+      greturn *ret;
 
       if (in_lto_p)
        get_untransformed_body ();