# HG changeset patch
# User thartmann
# Date 1484728202 0
# Node ID 617ed26c48d2b80cf005de0a253ba33f11721a27
# Parent  96560cffef4db891b7b5a69d62dfcf6e2f571ac3# Parent  ff64053e7c5f30fd4ae0960392e5afe395ca157d
Merge

diff -r 96560cffef4d -r 617ed26c48d2 hotspot/src/share/vm/compiler/compilerDirectives.hpp
--- a/hotspot/src/share/vm/compiler/compilerDirectives.hpp	Tue Jan 17 21:38:07 2017 -0800
+++ b/hotspot/src/share/vm/compiler/compilerDirectives.hpp	Wed Jan 18 08:30:02 2017 +0000
@@ -60,13 +60,12 @@
     cflags(BlockLayoutByFrequency,  bool, BlockLayoutByFrequency,  BlockLayoutByFrequency) \
     cflags(PrintOptoAssembly,       bool, PrintOptoAssembly, PrintOptoAssembly) \
     cflags(PrintIntrinsics,         bool, PrintIntrinsics, PrintIntrinsics) \
-    cflags(TraceOptoPipelining,     bool, false, TraceOptoPipelining) \
-    cflags(TraceOptoOutput,         bool, false, TraceOptoOutput) \
+NOT_PRODUCT(cflags(TraceOptoPipelining, bool, TraceOptoPipelining, TraceOptoPipelining)) \
+NOT_PRODUCT(cflags(TraceOptoOutput,     bool, TraceOptoOutput, TraceOptoOutput)) \
     cflags(TraceSpilling,           bool, TraceSpilling, TraceSpilling) \
     cflags(Vectorize,               bool, false, Vectorize) \
     cflags(VectorizeDebug,         uintx, 0, VectorizeDebug) \
     cflags(CloneMapDebug,           bool, false, CloneMapDebug) \
-    cflags(DoReserveCopyInSuperWordDebug, bool, false, DoReserveCopyInSuperWordDebug) \
     cflags(IGVPrintLevel,           intx, PrintIdealGraphLevel, IGVPrintLevel) \
     cflags(MaxNodeLimit,            intx, MaxNodeLimit, MaxNodeLimit)
 #else
diff -r 96560cffef4d -r 617ed26c48d2 hotspot/src/share/vm/opto/compile.cpp
--- a/hotspot/src/share/vm/opto/compile.cpp	Tue Jan 17 21:38:07 2017 -0800
+++ b/hotspot/src/share/vm/opto/compile.cpp	Wed Jan 18 08:30:02 2017 +0000
@@ -971,7 +971,7 @@
     _java_calls(0),
     _inner_loops(0),
 #ifndef PRODUCT
-    _trace_opto_output(TraceOptoOutput),
+    _trace_opto_output(directive->TraceOptoOutputOption),
     _in_dump_cnt(0),
     _printer(NULL),
 #endif