summaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJan Hubicka <hubicka@ucw.cz>2014-12-16 23:30:22 +0100
committerJan Hubicka <hubicka@gcc.gnu.org>2014-12-16 22:30:22 +0000
commitc0f15a3f249fa7ec0a210e540c0d3af7f642ccfa (patch)
tree5e8770e2c8beaef5cad371f88926b12b43d68107 /gcc
parent061ddf67f7bb299e3eff9ea5cc96d12668ea8f56 (diff)
* fibonacci_heap.h (min): Return m_data instead of non-existing data.
From-SVN: r218797
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/fibonacci_heap.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index da100964804..54e7aa90a92 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
2014-12-16 Jan Hubicka <hubicka@ucw.cz>
+ * fibonacci_heap.h (min): Return m_data instead of non-existing data.
+
+2014-12-16 Jan Hubicka <hubicka@ucw.cz>
+
* ipa-inline-analysis.c (will_be_nonconstant_predicate): Consider
return values of const calls as constants.
(estimate_function_body_sizes): Expect calls to have false predicates.
diff --git a/gcc/fibonacci_heap.h b/gcc/fibonacci_heap.h
index 3fce3701737..5bbde26aef0 100644
--- a/gcc/fibonacci_heap.h
+++ b/gcc/fibonacci_heap.h
@@ -211,7 +211,7 @@ public:
if (m_min == NULL)
return NULL;
- return m_min->data;
+ return m_min->m_data;
}
/* Replace data associated with NODE and replace it with DATA. */