Mercurial > hg > truffle
comparison src/share/vm/c1/c1_IR.cpp @ 1330:4a9cc99938e3
Merge
author | acorn |
---|---|
date | Fri, 26 Mar 2010 11:10:26 -0400 |
parents | 3cf667df43ef |
children | c18cbe5936b8 61b2245abf36 |
comparison
equal
deleted
inserted
replaced
1329:84043c7507b9 | 1330:4a9cc99938e3 |
---|---|
1 /* | 1 /* |
2 * Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved. | 2 * Copyright 1999-2010 Sun Microsystems, Inc. All Rights Reserved. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * | 4 * |
5 * This code is free software; you can redistribute it and/or modify it | 5 * This code is free software; you can redistribute it and/or modify it |
6 * under the terms of the GNU General Public License version 2 only, as | 6 * under the terms of the GNU General Public License version 2 only, as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
257 _exception_handlers = new XHandlers(info->_exception_handlers); | 257 _exception_handlers = new XHandlers(info->_exception_handlers); |
258 } | 258 } |
259 } | 259 } |
260 | 260 |
261 | 261 |
262 void CodeEmitInfo::record_debug_info(DebugInformationRecorder* recorder, int pc_offset) { | 262 void CodeEmitInfo::record_debug_info(DebugInformationRecorder* recorder, int pc_offset, bool is_method_handle_invoke) { |
263 // record the safepoint before recording the debug info for enclosing scopes | 263 // record the safepoint before recording the debug info for enclosing scopes |
264 recorder->add_safepoint(pc_offset, _oop_map->deep_copy()); | 264 recorder->add_safepoint(pc_offset, _oop_map->deep_copy()); |
265 _scope_debug_info->record_debug_info(recorder, pc_offset, true/*topmost*/); | 265 _scope_debug_info->record_debug_info(recorder, pc_offset, true/*topmost*/, is_method_handle_invoke); |
266 recorder->end_safepoint(pc_offset); | 266 recorder->end_safepoint(pc_offset); |
267 } | 267 } |
268 | 268 |
269 | 269 |
270 void CodeEmitInfo::add_register_oop(LIR_Opr opr) { | 270 void CodeEmitInfo::add_register_oop(LIR_Opr opr) { |