* src/vmcore/options.c (TraceJavaCalls): Remove this option when vmlog

is enabled. (It does not have the expected effect then).

--HG--
branch : edwin-replacement
extra : transplant_source : x%B8%10Pw%1B%7E%5E%A3%9F%83%FB%04%1B%B9%5B%F2%0Fq%CC

diff --git a/src/vmcore/options.c b/src/vmcore/options.c
index 32cbd97187952ace8c8677f4aee55806b46f7f2e..ee6599dd2609f6b521d510f2ee78631df560217e 100644 (file)
--- a/src/vmcore/options.c
+++ b/src/vmcore/options.c
@@ -279,7 +279,9 @@ option_t options_XX[] = {
        { "ThreadStackSize",           OPT_ThreadStackSize,           OPT_TYPE_VALUE,   "TODO" },
        { "TraceCompilerCalls",        OPT_TraceCompilerCalls,        OPT_TYPE_BOOLEAN, "trace JIT compiler calls" },
        { "TraceExceptions",           OPT_TraceExceptions,           OPT_TYPE_BOOLEAN, "trace Exception throwing" },
+#if !defined(ENABLE_VMLOG)
        { "TraceJavaCalls",            OPT_TraceJavaCalls,            OPT_TYPE_BOOLEAN, "trace Java method calls" },
+#endif
        { "TraceJNICalls",             OPT_TraceJNICalls,             OPT_TYPE_BOOLEAN, "trace JNI method calls" },
        { "TraceJVMCalls",             OPT_TraceJVMCalls,             OPT_TYPE_BOOLEAN, "trace JVM method calls but omit very frequent ones" },
        { "TraceJVMCallsVerbose",      OPT_TraceJVMCallsVerbose,      OPT_TYPE_BOOLEAN, "trace all JVM method calls" },