[vmkit-commits] [vmkit] r200692 - Aggressive inline seems ok.

[Gael Thomas]

Author: gthomas
Date: Mon Feb  3 07:02:09 2014
New Revision: 200692

URL: http://llvm.org/viewvc/llvm-project?rev=200692&view=rev
Log:
Aggressive inline seems ok.

Modified:
    vmkit/branches/mcjit/lib/j3/vm/j3method.cc
    vmkit/branches/mcjit/lib/vmkit/inliner.cc

Modified: vmkit/branches/mcjit/lib/j3/vm/j3method.cc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/j3/vm/j3method.cc?rev=200692&r1=200691&r2=200692&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/j3/vm/j3method.cc (original)
+++ vmkit/branches/mcjit/lib/j3/vm/j3method.cc Mon Feb  3 07:02:09 2014
@@ -52,7 +52,7 @@ vmkit::CompilationUnit* J3Method::unit()
 }
 
 uint64_t J3Method::inlineWeight() {
-	if(0 && J3Thread::get()->vm()->options()->enableInlining)
+	if(1 && J3Thread::get()->vm()->options()->enableInlining)
 		return vmkit::Symbol::inlineWeight();
 	else
 		return (uint64_t)-1;

Modified: vmkit/branches/mcjit/lib/vmkit/inliner.cc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/vmkit/inliner.cc?rev=200692&r1=200691&r2=200692&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/vmkit/inliner.cc (original)
+++ vmkit/branches/mcjit/lib/vmkit/inliner.cc Mon Feb  3 07:02:09 2014
@@ -109,6 +109,12 @@ namespace vmkit {
 																													 llvm::cast<llvm::Function>(gv)->getFunctionType()) :
 								function->getParent()->getOrInsertGlobal(gv->getName().data(), gv->getType()->getContainedType(0));
 
+							if(curSymbol && curSymbol->unit()) {
+								Symbol* remoteSymbol = curSymbol->unit()->getSymbol(gv->getName().data(), 0);
+								if(remoteSymbol)
+									originalUnit->addSymbol(gv->getName().data(), remoteSymbol);
+							}
+
 							//fprintf(stderr, "<<<reimporting>>>: %s\n", gv->getName().data());
 							insn->setOperand(i, copy);
 						}