Mercurial > hg > truffle
diff src/share/vm/runtime/arguments.cpp @ 1330:4a9cc99938e3
Merge
author | acorn |
---|---|
date | Fri, 26 Mar 2010 11:10:26 -0400 |
parents | cc98cc548f51 |
children | 56507bcd639e |
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp Thu Mar 25 16:54:59 2010 -0700 +++ b/src/share/vm/runtime/arguments.cpp Fri Mar 26 11:10:26 2010 -0400 @@ -1346,9 +1346,7 @@ } if (FLAG_IS_DEFAULT(MarkStackSize)) { - // Size as a multiple of TaskQueueSuper::N which is larger - // for 64-bit. - FLAG_SET_DEFAULT(MarkStackSize, 128 * TaskQueueSuper::total_size()); + FLAG_SET_DEFAULT(MarkStackSize, 128 * TASKQUEUE_SIZE); } if (PrintGCDetails && Verbose) { tty->print_cr("MarkStackSize: %uk MarkStackSizeMax: %uk", @@ -2859,6 +2857,12 @@ } #endif // _LP64 + // MethodHandles code does not support TaggedStackInterpreter. + if (EnableMethodHandles && TaggedStackInterpreter) { + warning("TaggedStackInterpreter is not supported by MethodHandles code. Disabling TaggedStackInterpreter."); + TaggedStackInterpreter = false; + } + // Check the GC selections again. if (!check_gc_consistency()) { return JNI_EINVAL;