1.1 --- a/src/share/vm/runtime/globals.hpp Thu Jun 03 13:34:47 2010 -0400
1.2 +++ b/src/share/vm/runtime/globals.hpp Fri Jun 04 17:44:51 2010 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright 1997-2010 Sun Microsystems, Inc. All Rights Reserved.
1.6 + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -16,9 +16,9 @@
1.11 * 2 along with this work; if not, write to the Free Software Foundation,
1.12 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
1.13 *
1.14 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
1.15 - * CA 95054 USA or visit www.sun.com if you need additional information or
1.16 - * have any questions.
1.17 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
1.18 + * or visit www.oracle.com if you need additional information or have any
1.19 + * questions.
1.20 *
1.21 */
1.22
1.23 @@ -321,6 +321,9 @@
1.24 diagnostic(bool, PrintCompressedOopsMode, false, \
1.25 "Print compressed oops base address and encoding mode") \
1.26 \
1.27 + lp64_product(intx, ObjectAlignmentInBytes, 8, \
1.28 + "Default object alignment in bytes, 8 is minimum") \
1.29 + \
1.30 /* UseMembar is theoretically a temp flag used for memory barrier \
1.31 * removal testing. It was supposed to be removed before FCS but has \
1.32 * been re-added (see 6401008) */ \
1.33 @@ -1121,6 +1124,9 @@
1.34 product(intx, TraceRedefineClasses, 0, \
1.35 "Trace level for JVMTI RedefineClasses") \
1.36 \
1.37 + develop(bool, StressMethodComparator, false, \
1.38 + "run the MethodComparator on all loaded methods") \
1.39 + \
1.40 /* change to false by default sometime after Mustang */ \
1.41 product(bool, VerifyMergedCPBytecodes, true, \
1.42 "Verify bytecodes after RedefineClasses constant pool merging") \
