Merge

3805910e · amurillo · ac212237 · 018cded2 · 3805910e · 3805910e
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

make/hotspot_version make/hotspot_version +1 -1

src/share/vm/opto/c2_globals.hpp src/share/vm/opto/c2_globals.hpp +1 -1

未找到文件。
--- a/make/hotspot_version
+++ b/make/hotspot_version
@@ -35,7 +35,7 @@ HOTSPOT_VM_COPYRIGHT=Copyright 2014

 HS_MAJOR_VER=25
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=68
+HS_BUILD_NUMBER=69

 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8

--- a/src/share/vm/opto/c2_globals.hpp
+++ b/src/share/vm/opto/c2_globals.hpp
@@ -445,7 +445,7 @@
  notproduct(bool, PrintEliminateLocks, false,                              \
          "Print out when locks are eliminated")                            \
                                                                            \
-  product(bool, EliminateAutoBox, true,                                     \
+  product(bool, EliminateAutoBox, false,                                    \
          "Control optimizations for autobox elimination")                  \
                                                                            \
  experimental(bool, UseImplicitStableValues, false,                        \