# HG changeset patch
# User Christian Haeubl <haeubl@ssw.jku.at>
# Date 1373361666 -7200
# Node ID dcee58529a1c5509883d24e540a85f95df739590
# Parent  a9b76e1e5ab3120e6b7032bba7002d8e6d2a88ba# Parent  4ef92b67aeae194ef867edae53f5fb998f7c01a9
Merge.

diff -r 4ef92b67aeae -r dcee58529a1c graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/Assumptions.java
--- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/Assumptions.java	Tue Jul 09 10:40:37 2013 +0200
+++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/Assumptions.java	Tue Jul 09 11:21:06 2013 +0200
@@ -281,10 +281,12 @@
 
             int index;
 
+            @Override
             public void remove() {
                 throw new UnsupportedOperationException();
             }
 
+            @Override
             public Assumption next() {
                 if (index >= count) {
                     throw new NoSuchElementException();
@@ -292,6 +294,7 @@
                 return list[index++];
             }
 
+            @Override
             public boolean hasNext() {
                 return index < count;
             }
diff -r 4ef92b67aeae -r dcee58529a1c src/share/vm/runtime/compilationPolicy.cpp
--- a/src/share/vm/runtime/compilationPolicy.cpp	Tue Jul 09 10:40:37 2013 +0200
+++ b/src/share/vm/runtime/compilationPolicy.cpp	Tue Jul 09 11:21:06 2013 +0200
@@ -464,9 +464,6 @@
   const int comp_level = CompLevel_highest_tier;
   const int hot_count = m->backedge_count();
   const char* comment = "backedge_count";
-#ifdef GRAALVM
-  reset_counter_for_back_branch_event(m);
-#endif
 
   if (is_compilation_enabled() && !m->is_not_osr_compilable(comp_level) && can_be_compiled(m, comp_level)) {
     CompileBroker::compile_method(m, bci, comp_level, m, hot_count, comment, thread);