[vmkit-commits] [vmkit] r180298 - Minor corrections in ObjectModel.

[Peter Senna Tschudin]

Author: peter.senna
Date: Thu Apr 25 11:50:07 2013
New Revision: 180298

URL: http://llvm.org/viewvc/llvm-project?rev=180298&view=rev
Log:
Minor corrections in ObjectModel.
(cherry picked from commit 771ed80d50b507949ca0b9872aff9d19508f82c3)

Modified:
    vmkit/trunk/mmtk/mmtk-j3/ObjectModel.cpp

Modified: vmkit/trunk/mmtk/mmtk-j3/ObjectModel.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/ObjectModel.cpp?rev=180298&r1=180297&r2=180298&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/ObjectModel.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/ObjectModel.cpp Thu Apr 25 11:50:07 2013
@@ -35,8 +35,8 @@ extern "C" gcHeader* Java_org_j3_mmtk_Ob
 	return obj ? obj->toHeader() : 0;
 }
 
-extern "C" gc* Java_org_j3_mmtk_ObjectModel_refToAddress__Lorg_vmmagic_unboxed_ObjectReference_2 (MMTkObject* OM, gc* obj) {
-	return obj;
+extern "C" gcHeader* Java_org_j3_mmtk_ObjectModel_refToAddress__Lorg_vmmagic_unboxed_ObjectReference_2 (MMTkObject* OM, gc* obj) {
+	return obj ? obj->toHeader() : 0;
 }
 
 extern "C" uint8_t Java_org_j3_mmtk_ObjectModel_readAvailableByte__Lorg_vmmagic_unboxed_ObjectReference_2 (MMTkObject* OM, gc* obj) {
@@ -70,9 +70,9 @@ extern "C" void Java_org_j3_bindings_Bin
  	header->toReference()->setVirtualTable(VT);
 }
 
-extern "C" int Java_org_j3_bindings_Bindings_hiddenHeaderSize__Lorg_vmmagic_unboxed_Address_2Lorg_vmmagic_unboxed_ObjectReference_2() ALWAYS_INLINE;
+extern "C" int Java_org_j3_bindings_Bindings_hiddenHeaderSize__() ALWAYS_INLINE;
 
-extern "C" int Java_org_j3_bindings_Bindings_hiddenHeaderSize__Lorg_vmmagic_unboxed_Address_2Lorg_vmmagic_unboxed_ObjectReference_2() {
+extern "C" int Java_org_j3_bindings_Bindings_hiddenHeaderSize__() {
 	return gcHeader::hiddenHeaderSize();
 }