[vmkit-commits] [vmkit] r180474 - MMTkMutatorAllocate() allocated object should not be given to
Peter Senna Tschudin
peter.senna at gmail.com
Thu Apr 25 10:15:53 PDT 2013
Author: peter.senna
Date: Thu Apr 25 12:14:23 2013
New Revision: 180474
URL: http://llvm.org/viewvc/llvm-project?rev=180474&view=rev
Log:
MMTkMutatorAllocate() allocated object should not be given to
llvm_gcroot().(cherry picked from commit e32d14817cf26796bf5010f7a472c80f94cfd5a6)
Modified:
vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp
Modified: vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp?rev=180474&r1=180473&r2=180474&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp Thu Apr 25 12:14:23 2013
@@ -293,13 +293,11 @@ void Collector::initialise(int argc, cha
}
extern "C" void* MMTkMutatorAllocate(uint32_t size, void* type) {
- gc* val = NULL;
gcHeader* head = NULL;
- llvm_gcroot(val, 0);
size += gcHeader::hiddenHeaderSize();
size = llvm::RoundUpToAlignment(size, sizeof(void*));
head = (gcHeader*)MutatorThread::get()->Allocator.Allocate(size);
- val = head->toReference();
+ void* val = head->toReference();
vmkit::Thread::get()->MyVM->setType(val, type);
return val;
}
More information about the vmkit-commits
mailing list