Mercurial > hg > truffle

diff src/share/vm/graal/graalCodeInstaller.cpp @ 4229:8074251d1e05

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix bug in code installer that caused builds with assertions to crash
author Gilles Duboscq <gilles.m.duboscq@gmail.com>
date Thu, 05 Jan 2012 17:25:28 +0100
parents e0a4668c57a2
children 382523fc390c
line wrap: on
line diff
--- a/src/share/vm/graal/graalCodeInstaller.cpp	Thu Jan 05 14:53:37 2012 +0100
+++ b/src/share/vm/graal/graalCodeInstaller.cpp	Thu Jan 05 17:25:28 2012 +0100
@@ -793,6 +793,9 @@
         TRACE_graal_3("relocating (HotSpotType) at %016x/%016x", instruction, operand);
       } else {
         jobject value = JNIHandles::make_local(obj());
+        if (obj() == HotSpotProxy::DUMMY_CONSTANT_OBJ()) {
+          value = (jobject) Universe::non_oop_word();
+        }
         *((jobject*) operand) = value;
         _instructions->relocate(instruction, oop_Relocation::spec_for_immediate(), Assembler::imm_operand);
         TRACE_graal_3("relocating (oop constant) at %016x/%016x", instruction, operand);