[vmkit-commits] [vmkit] r141016 - in /vmkit/trunk: lib/J3/Compiler/LLVMInfo.cpp mmtk/mmtk-alloc/Selected.cpp
Nicolas Geoffray
nicolas.geoffray at lip6.fr
Mon Oct 3 12:58:44 PDT 2011
Author: geoffray
Date: Mon Oct 3 14:58:39 2011
New Revision: 141016
URL: http://llvm.org/viewvc/llvm-project?rev=141016&view=rev
Log:
- Don't put NoInline when compiling without cooperative GC and let LLVM decide.
- Small cleanup in Selected.cpp.
Modified:
vmkit/trunk/lib/J3/Compiler/LLVMInfo.cpp
vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp
Modified: vmkit/trunk/lib/J3/Compiler/LLVMInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/LLVMInfo.cpp?rev=141016&r1=141015&r2=141016&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/LLVMInfo.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/LLVMInfo.cpp Mon Oct 3 14:58:39 2011
@@ -192,9 +192,11 @@
GlobalValue::ExternalWeakLinkage,
"", Compiler->getLLVMModule());
}
-
+
result->setGC("vmkit");
- result->addFnAttr(Attribute::NoInline);
+ if (Compiler->useCooperativeGC()) {
+ result->addFnAttr(Attribute::NoInline);
+ }
result->addFnAttr(Attribute::NoUnwind);
Compiler->functions.insert(std::make_pair(result, methodDef));
Modified: vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp?rev=141016&r1=141015&r2=141016&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp Mon Oct 3 14:58:39 2011
@@ -156,14 +156,11 @@
void Collector::collect() {
Java_org_j3_mmtk_Collection_triggerCollection__I(NULL, 2);
}
-
-int argc;
-char** argv;
+
+static const char* kPrefix = "-X:gc:";
+static const int kPrefixLength = strlen(kPrefix);
void Collector::initialise(int argc, char** argv) {
- static const char* kPrefix = "-X:gc:";
- static const int kPrefixLength = strlen(kPrefix);
-
int i = 1;
int count = 0;
ThreadAllocator allocator;
More information about the vmkit-commits
mailing list