bitmap.c (bitmap_descriptor): Adjust order of parameters to match MEM_STAT_DECL.

	* bitmap.c (bitmap_descriptor): Adjust order of parameters to
	match MEM_STAT_DECL.
	* statistics.h (ALONE_FINAL_MEM_STAT_DECL): Correct typo.

From-SVN: r189819

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ef1dc84246044c67d4c900f0b85013bc046acc4c..886f8403407f21d4b0fb5ab7ce3932e49cb19c37 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-24  Jason Merrill  <jason@redhat.com>
+
+       * bitmap.c (bitmap_descriptor): Adjust order of parameters to
+       match MEM_STAT_DECL.
+       * statistics.h (ALONE_FINAL_MEM_STAT_DECL): Correct typo.
+
 2012-07-24  Richard Henderson  <rth@redhat.com>
 
        * optabs.h (struct optab_d): Rename code member to code_.

diff --git a/gcc/bitmap.c b/gcc/bitmap.c
index 2b779677550ebdaab3953cd60df59a003deb0a00..4ac129fb2755715f4606be58971ef60a0f89767d 100644 (file)
--- a/gcc/bitmap.c
+++ b/gcc/bitmap.c
@@ -68,7 +68,7 @@ eq_descriptor (const void *p1, const void *p2)
 
 /* For given file and line, return descriptor, create new if needed.  */
 static struct bitmap_descriptor *
-bitmap_descriptor (const char *file, const char *function, int line)
+bitmap_descriptor (const char *file, int line, const char *function)
 {
   struct bitmap_descriptor **slot;
   struct loc loc;

diff --git a/gcc/statistics.h b/gcc/statistics.h
index 60fd68a36d129ea35eeda8769c527edf869ca937..8ec0a990003487c6b1edf113a6b6fa857df5c2a1 100644 (file)
--- a/gcc/statistics.h
+++ b/gcc/statistics.h
@@ -29,7 +29,7 @@
 #define GCC_MEM_STAT_ARGUMENTS const char * ARG_UNUSED (_loc_name), int ARG_UNUSED (_loc_line), const char * ARG_UNUSED (_loc_function)
 #if GATHER_STATISTICS
 #define ALONE_MEM_STAT_DECL GCC_MEM_STAT_ARGUMENTS
-#define ALONE_FINAL_MEM_STAT_DECL ALONE_MEM_STAT_INFO
+#define ALONE_FINAL_MEM_STAT_DECL ALONE_MEM_STAT_DECL
 #define ALONE_PASS_MEM_STAT _loc_name, _loc_line,  _loc_function
 #define ALONE_FINAL_PASS_MEM_STAT ALONE_PASS_MEM_STAT
 #define ALONE_MEM_STAT_INFO __FILE__, __LINE__, __FUNCTION__