[vmkit-commits] [vmkit] r199643 - Don't use stub in aot mode.

[Gael Thomas]

Author: gthomas
Date: Mon Jan 20 04:53:34 2014
New Revision: 199643

URL: http://llvm.org/viewvc/llvm-project?rev=199643&view=rev
Log:
Don't use stub in aot mode.

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

Modified: vmkit/branches/mcjit/lib/j3/vm/j3.cc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/j3/vm/j3.cc?rev=199643&r1=199642&r2=199643&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/j3/vm/j3.cc (original)
+++ vmkit/branches/mcjit/lib/j3/vm/j3.cc Mon Jan 20 04:53:34 2014
@@ -217,6 +217,8 @@ void J3::compileApplication() {
 	llvm::Module* res = new llvm::Module("yop", llvmContext());
 	llvm::Linker* linker = new llvm::Linker(res);
 	loader->aotSnapshot(linker);
+
+	res->dump();
 }
 
 void J3::runApplication() {

Modified: vmkit/branches/mcjit/lib/j3/vm/j3codegen.cc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/j3/vm/j3codegen.cc?rev=199643&r1=199642&r2=199643&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/j3/vm/j3codegen.cc (original)
+++ vmkit/branches/mcjit/lib/j3/vm/j3codegen.cc Mon Jan 20 04:53:34 2014
@@ -204,7 +204,7 @@ llvm::Value* J3CodeGen::unflatten(llvm::
 }
 
 llvm::Function* J3CodeGen::buildFunction(J3Method* method, bool isStub) {
-	const char* id = (isStub && !method->fnPtr()) ? method->llvmStubName(cl) : method->llvmFunctionName(cl);
+	const char* id = (useStub() && isStub && !method->fnPtr()) ? method->llvmStubName(cl) : method->llvmFunctionName(cl);
 	loader->addSymbol(id, method);
 	return (llvm::Function*)module->getOrInsertFunction(id, method->signature()->functionType(method->access()));
 }

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=199643&r1=199642&r2=199643&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/j3/vm/j3method.cc (original)
+++ vmkit/branches/mcjit/lib/j3/vm/j3method.cc Mon Jan 20 04:53:34 2014
@@ -55,7 +55,7 @@ J3Signature::function_t J3Method::cxxCal
 void J3Method::aotCompile() {
 	if(!J3Cst::isAbstract(access())) {
 		//fprintf(stderr, "compiling: %s::%s%s\n", cl()->name()->cStr(), name()->cStr(), signature()->name()->cStr());
-		ensureCompiled(J3CodeGen::WithMethod | J3CodeGen::OnlyTranslate);
+		ensureCompiled(J3CodeGen::WithMethod | J3CodeGen::OnlyTranslate | J3CodeGen::NotUseStub);
 	}
 }