[Merge chakra-core/ChakraCore@b0c58262f5] Use Phase instead of boolea…

…n flag for GloboptInstrString dump
nodejs · Sep 25, 2017 · 0dacfea · 0dacfea
1 parent f270b1a
commit 0dacfea
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/deps/chakrashim/core/lib/Backend/IR.cpp b/deps/chakrashim/core/lib/Backend/IR.cpp
@@ -4209,7 +4209,7 @@ Instr::DumpByteCodeOffset()
 void
 Instr::DumpGlobOptInstrString()
 {
-    if(this->globOptInstrString && Js::Configuration::Global.flags.PrintGlobOptInstrString)
+    if(this->globOptInstrString && !PHASE_OFF(Js::DumpGlobOptInstrPhase, m_func))
     {
         Output::Print(_u("\n\n GLOBOPT INSTR: %s\n\n"), this->globOptInstrString);
     }

diff --git a/deps/chakrashim/core/lib/Common/ConfigFlagsList.h b/deps/chakrashim/core/lib/Common/ConfigFlagsList.h
@@ -191,6 +191,7 @@ PHASE(All)
                     PHASE(MarkTempNumber)
                     PHASE(MarkTempObject)
                     PHASE(MarkTempNumberOnTempObject)
+        PHASE(DumpGlobOptInstr) // Print the Globopt instr string in post lower dumps
         PHASE(Lowerer)
             PHASE(FastPath)
                 PHASE(LoopFastPath)
@@ -1286,7 +1287,6 @@ FLAGNR(Boolean, PrintRunTimeDataCollectionTrace, "Print traces needed for runtim
 FLAGR (Boolean, Prejit                , "Prejit everything, including things that are not called, ignoring limits (default: false)", DEFAULT_CONFIG_Prejit)
 #endif
 FLAGNR(Boolean, PrintSrcInDump        , "Print the lineno and the source code in the intermediate dumps", true)
-FLAGNR(Boolean, PrintGlobOptInstrString, "Print the Globopt instr string in post lower dumps", true)
 #if PROFILE_DICTIONARY
 FLAGNR(Number,  ProfileDictionary     , "Profile dictionary usage. Only dictionaries with max depth of <number> or above are displayed (0=no filter).", -1)
 #endif