* src/vm/jit/jit.c (jit_compile_intern): Fixed error in preprocessor flags logic.

* src/vm/jit/replace.c (replace_me): Suppress printf.

diff --git a/src/vm/jit/jit.c b/src/vm/jit/jit.c
index b93f8dacc05c2b35293dcd1006907f654851a4d0..971a9dd752b937a6d9554b44dbd5b81d24d0bcc1 100644 (file)
--- a/src/vm/jit/jit.c
+++ b/src/vm/jit/jit.c
@@ -722,7 +722,7 @@ static u1 *jit_compile_intern(jitdata *jd)
 
                /* inlining */
 
-#if defined(ENABLE_INLINING) && !defined(ENABLE_ESCAPE) || 1
+#if defined(ENABLE_INLINING) && (!defined(ENABLE_ESCAPE) || 1)
                if (JITDATA_HAS_FLAG_INLINE(jd)) {
                        if (!inline_inline(jd))
                                return NULL;

diff --git a/src/vm/jit/replace.c b/src/vm/jit/replace.c
index c08d48d1ef6809d29d57f9f14837b5d9bec00490..58f883c1ae997643f684efffb53abe806239c24e 100644 (file)
--- a/src/vm/jit/replace.c
+++ b/src/vm/jit/replace.c
@@ -2868,7 +2868,9 @@ static void replace_me(rplpoint *rp, executionstate_t *es)
        origcode = es->code;
        origrp   = rp;
 
+#if defined(ENABLE_TLH)
        printf("Replacing in %s/%s\n", rp->method->clazz->name->text, rp->method->name->text);
+#endif
 
        /*if (strcmp(rp->method->clazz->name->text, "antlr/AlternativeElement") == 0 && strcmp(rp->method->name->text, "getAutoGenType") ==0) opt_TraceReplacement = 2; else opt_TraceReplacement = 0;*/