Mercurial > hg > truffle

diff src/share/vm/graal/graalCodeInstaller.cpp @ 5326:a53162ca8219

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
introduced HotSpotKlassOop type to convey a klassOop value from the compiler to the C++ code instead of relying on the C++ code automagically converting a HotSpotTypeResolvedImpl value to a klassOop
author Doug Simon <doug.simon@oracle.com>
date Mon, 30 Apr 2012 20:15:20 +0200
parents 290b3025b66f
children e318468952f5
line wrap: on
line diff
--- a/src/share/vm/graal/graalCodeInstaller.cpp	Mon Apr 30 15:41:14 2012 +0200
+++ b/src/share/vm/graal/graalCodeInstaller.cpp	Mon Apr 30 20:15:20 2012 +0200
@@ -743,8 +743,7 @@
     case 's':
     case 'c':
     case 'i':
-      fatal("int-sized values not expected in DataPatch")
-      ;
+      fatal("int-sized values not expected in DataPatch");
       break;
     case 'f':
     case 'j':
@@ -773,9 +772,9 @@
       address operand = Assembler::locate_operand(instruction, Assembler::imm_operand);
       Handle obj = CiConstant::object(constant);
 
-      if (obj->is_a(HotSpotTypeResolved::klass())) {
+      if (obj->is_a(HotSpotKlassOop::klass())) {
         assert(!obj.is_null(), "");
-        *((jobject*) operand) = JNIHandles::make_local(java_lang_Class::as_klassOop(HotSpotTypeResolved::javaMirror(obj)));
+        *((jobject*) operand) = JNIHandles::make_local(java_lang_Class::as_klassOop(HotSpotKlassOop::javaMirror(obj)));
         _instructions->relocate(instruction, oop_Relocation::spec_for_immediate(), Assembler::imm_operand);
         TRACE_graal_3("relocating (HotSpotType) at %016x/%016x", instruction, operand);
       } else {