Mercurial > hg > truffle
changeset 10665:dcee58529a1c
Merge.
| author | Christian Haeubl <haeubl@ssw.jku.at> |
|---|---|
| date | Tue, 09 Jul 2013 11:21:06 +0200 |
| parents | a9b76e1e5ab3 (diff) 4ef92b67aeae (current diff) |
| children | 9808158cfeab e7d07c9bb779 |
| files | graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/HotSpotNmethodExecuteNode.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HotSpotNmethodIntrinsics.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HotSpotNmethodSubstitutions.java |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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; }
--- 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);