Mercurial > hg > graal-jvmci-8
changeset 5553:511612d1b5c1
Fix renamings in C++ part.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Sat, 09 Jun 2012 22:50:50 +0200 |
parents | 69a8969dbf40 |
children | 70f715dfbb41 |
files | graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/RegisterValue.java src/share/vm/graal/graalCodeInstaller.cpp src/share/vm/graal/graalJavaAccess.cpp src/share/vm/graal/graalJavaAccess.hpp |
diffstat | 4 files changed, 9 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/RegisterValue.java Sat Jun 09 21:50:02 2012 +0200 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/RegisterValue.java Sat Jun 09 22:50:50 2012 +0200 @@ -32,14 +32,14 @@ public final class RegisterValue extends Value { private static final long serialVersionUID = 7999341472196897163L; - private final Register register; + private final Register reg; /** * Should only be called from {@link Register#CiRegister} to ensure canonicalization. */ protected RegisterValue(Kind kind, Register register) { super(kind); - this.register = register; + this.reg = register; } @Override @@ -56,6 +56,6 @@ * @return the register that contains the value */ public Register getRegister() { - return register; + return reg; } }
--- a/src/share/vm/graal/graalCodeInstaller.cpp Sat Jun 09 21:50:02 2012 +0200 +++ b/src/share/vm/graal/graalCodeInstaller.cpp Sat Jun 09 22:50:50 2012 +0200 @@ -529,7 +529,7 @@ // jint next_pc_offset = Assembler::locate_next_instruction(instruction) - _instructions->start(); _debug_recorder->add_safepoint(pc_offset, -1, create_oop_map(_total_frame_size, _parameter_count, debug_info)); - oop code_pos = CiDebugInfo::codePos(debug_info); + oop code_pos = CiDebugInfo::bytecodePosition(debug_info); record_scope(pc_offset, code_pos, new GrowableArray<ScopeValue*>()); _debug_recorder->end_safepoint(pc_offset); @@ -641,7 +641,7 @@ } if (debug_info != NULL) { - oop frame = CiDebugInfo::codePos(debug_info); + oop frame = CiDebugInfo::bytecodePosition(debug_info); _debug_recorder->add_safepoint(next_pc_offset, CiFrame::leafGraphId(frame), create_oop_map(_total_frame_size, _parameter_count, debug_info)); record_scope(next_pc_offset, frame, new GrowableArray<ScopeValue*>()); }
--- a/src/share/vm/graal/graalJavaAccess.cpp Sat Jun 09 21:50:02 2012 +0200 +++ b/src/share/vm/graal/graalJavaAccess.cpp Sat Jun 09 22:50:50 2012 +0200 @@ -36,8 +36,9 @@ tty->print_cr("symbol with name %s was not found in symbol table (klass=%s)", name, klass_oop->klass_part()->name()->as_C_string()); } #endif - guarantee(name_symbol != NULL, "symbol not found - class layout changed?"); - guarantee(signature_symbol != NULL, "symbol not found - class layout changed?"); + if (name_symbol == NULL || signature_symbol == NULL) { + guarantee(false, err_msg("symbol not found - class layout of %s changed?", klass_oop->klass_part()->name()->as_C_string())); + } instanceKlass* ik = instanceKlass::cast(klass_oop); fieldDescriptor fd;
--- a/src/share/vm/graal/graalJavaAccess.hpp Sat Jun 09 21:50:02 2012 +0200 +++ b/src/share/vm/graal/graalJavaAccess.hpp Sat Jun 09 22:50:50 2012 +0200 @@ -152,7 +152,7 @@ oop_field(CiTargetMethod_Mark, references, "[Lcom/oracle/graal/api/code/CompilationResult$Mark;") \ end_class \ start_class(CiDebugInfo) \ - oop_field(CiDebugInfo, codePos, "Lcom/oracle/graal/api/code/BytecodePosition;") \ + oop_field(CiDebugInfo, bytecodePosition, "Lcom/oracle/graal/api/code/BytecodePosition;") \ oop_field(CiDebugInfo, registerRefMap, "Ljava/util/BitSet;") \ oop_field(CiDebugInfo, frameRefMap, "Ljava/util/BitSet;") \ end_class \