Mercurial > hg > truffle

comparison src/share/vm/graal/graalCodeInstaller.cpp @ 13816:d006a6332db8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make sure a compile id is assigned
author Tom Rodriguez <tom.rodriguez@oracle.com>
date Wed, 29 Jan 2014 14:06:32 -0800
parents 343541fb3b49
children fe034af88233
comparison
equal deleted inserted replaced
13815:9a8e4dfae480 13816:d006a6332db8
20 * or visit www.oracle.com if you need additional information or have any 20 * or visit www.oracle.com if you need additional information or have any
21 * questions. 21 * questions.
22 */ 22 */
23 23
24 #include "precompiled.hpp" 24 #include "precompiled.hpp"
25 #include "compiler/compileBroker.hpp"
25 #include "compiler/disassembler.hpp" 26 #include "compiler/disassembler.hpp"
26 #include "runtime/javaCalls.hpp" 27 #include "runtime/javaCalls.hpp"
27 #include "graal/graalEnv.hpp" 28 #include "graal/graalEnv.hpp"
28 #include "graal/graalCompiler.hpp" 29 #include "graal/graalCompiler.hpp"
29 #include "graal/graalCodeInstaller.hpp" 30 #include "graal/graalCodeInstaller.hpp"
417 } else { 418 } else {
418 nmethod* nm = NULL; 419 nmethod* nm = NULL;
419 methodHandle method = getMethodFromHotSpotMethod(HotSpotCompiledNmethod::method(compiled_code)); 420 methodHandle method = getMethodFromHotSpotMethod(HotSpotCompiledNmethod::method(compiled_code));
420 jint entry_bci = HotSpotCompiledNmethod::entryBCI(compiled_code); 421 jint entry_bci = HotSpotCompiledNmethod::entryBCI(compiled_code);
421 jint id = HotSpotCompiledNmethod::id(compiled_code); 422 jint id = HotSpotCompiledNmethod::id(compiled_code);
423 if (id == -1) {
424 // Make sure a valid compile_id is associated with every compile
425 id = CompileBroker::assign_compile_id(method, entry_bci);
426 }
422 result = GraalEnv::register_method(method, nm, entry_bci, &_offsets, _custom_stack_area_offset, &buffer, stack_slots, _debug_recorder->_oopmaps, &_exception_handler_table, 427 result = GraalEnv::register_method(method, nm, entry_bci, &_offsets, _custom_stack_area_offset, &buffer, stack_slots, _debug_recorder->_oopmaps, &_exception_handler_table,
423 GraalCompiler::instance(), _debug_recorder, _dependencies, NULL, id, false, leaf_graph_ids, installed_code, speculation_log); 428 GraalCompiler::instance(), _debug_recorder, _dependencies, NULL, id, false, leaf_graph_ids, installed_code, speculation_log);
424 cb = nm; 429 cb = nm;
425 } 430 }
426 431