summaryrefslogtreecommitdiffstats
path: root/vm/compiler/Compiler.c
diff options
context:
space:
mode:
Diffstat (limited to 'vm/compiler/Compiler.c')
-rw-r--r--vm/compiler/Compiler.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/vm/compiler/Compiler.c b/vm/compiler/Compiler.c
index f70b9787b..203a08020 100644
--- a/vm/compiler/Compiler.c
+++ b/vm/compiler/Compiler.c
@@ -118,7 +118,6 @@ static void *compilerThreadStart(void *arg)
continue;
} else {
do {
- void *compiledCodePtr;
CompilerWorkOrder work = workDequeue();
dvmUnlockMutex(&gDvmJit.compilerLock);
/* Check whether there is a suspend request on me */
@@ -131,10 +130,10 @@ static void *compilerThreadStart(void *arg)
if (gDvmJit.haltCompilerThread) {
LOGD("Compiler shutdown in progress - discarding request");
} else {
- compiledCodePtr = dvmCompilerDoWork(&work);
/* Compilation is successful */
- if (compiledCodePtr) {
- dvmJitSetCodeAddr(work.pc, compiledCodePtr);
+ if (dvmCompilerDoWork(&work)) {
+ dvmJitSetCodeAddr(work.pc, work.result.codeAddress,
+ work.result.instructionSet);
}
}
free(work.info);