intermediate changes

ref:c3402b3ceb4aaa6583e15c4d0c4e8411d0051573

2 files changed, 106 insertions, 159 deletions

diff --git a/build/conf/compilers/gnu_compiler.conf b/build/conf/compilers/gnu_compiler.conf
index 0059a43143..064689f3ed 100644
--- a/build/conf/compilers/gnu_compiler.conf
+++ b/build/conf/compilers/gnu_compiler.conf
@@ -33,15 +33,15 @@ when ($WITH_VALGRIND == "yes") {
 C_DEFINES =-DFAKEID=$CPP_FAKEID
 C_DEFINES+=$_C_DEFINES_ANDROID
 C_DEFINES+=\
--DARCADIA_ROOT=${ARCADIA_ROOT} \
--DARCADIA_BUILD_ROOT=${ARCADIA_BUILD_ROOT} \
--D_THREAD_SAFE \
--D_PTHREADS \
--D_REENTRANT \
--D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES \
--D_LARGEFILE_SOURCE \
--D__STDC_CONSTANT_MACROS \
--D__STDC_FORMAT_MACROS
+    -DARCADIA_ROOT=${ARCADIA_ROOT} \
+    -DARCADIA_BUILD_ROOT=${ARCADIA_BUILD_ROOT} \
+    -D_THREAD_SAFE \
+    -D_PTHREADS \
+    -D_REENTRANT \
+    -D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES \
+    -D_LARGEFILE_SOURCE \
+    -D__STDC_CONSTANT_MACROS \
+    -D__STDC_FORMAT_MACROS
 C_DEFINES+=$_C_DEFINES_ANDROID_OTHERWISE
 C_DEFINES+=$_C_DEFINES_GNU_SOURCE
 C_DEFINES+=$_C_DEFINES_CLANG_LINUX_X86_64
@@ -80,27 +80,25 @@ when ($OS_IOS == "yes") {
 _C_WARNINGS_CLANG=
 _CXX_WARNINGS_CLANG=
 when ($CLANG == "yes") {
-
     _CXX_WARNINGS_CLANG=\
--Wimport-preprocessor-directive-pedantic \
--Wno-undefined-var-template \
--Wno-return-std-move \
--Wno-address-of-packed-member \
--Wno-defaulted-function-deleted \
--Wno-pessimizing-move \
--Wno-range-loop-construct \
--Wno-deprecated-anon-enum-enum-conversion \
--Wno-deprecated-enum-enum-conversion \
--Wno-deprecated-enum-float-conversion \
--Wno-ambiguous-reversed-operator \
--Wno-deprecated-volatile
-
-# -Wno-unknown-warning-option
-# For nvcc to accept the above.
+        -Wimport-preprocessor-directive-pedantic \
+        -Wno-undefined-var-template \
+        -Wno-return-std-move \
+        -Wno-address-of-packed-member \
+        -Wno-defaulted-function-deleted \
+        -Wno-pessimizing-move \
+        -Wno-range-loop-construct \
+        -Wno-deprecated-anon-enum-enum-conversion \
+        -Wno-deprecated-enum-enum-conversion \
+        -Wno-deprecated-enum-float-conversion \
+        -Wno-ambiguous-reversed-operator \
+        -Wno-deprecated-volatile
+
+    # -Wno-unknown-warning-option
+    # For nvcc to accept the above.
     _C_WARNINGS_CLANG=\
--Wno-implicit-const-int-float-conversion \
--Wno-unknown-warning-option
-
+        -Wno-implicit-const-int-float-conversion \
+        -Wno-unknown-warning-option
 }
 
 _C_FOPTIONS_GCC=
@@ -279,57 +277,6 @@ when ($NOGCCSTACKCHECK != "yes") {
     FSTACK += -fstack-check
 }
 
-# _C_DEBUG_LIGHT=-fdebug-prefix-map=${ARCADIA_BUILD_ROOT}=/-B
-# _C_DEBUG_LIGHT_CL=$_C_DEBUG_LIGHT -Xclang -fdebug-compilation-dir -Xclang /tmp
-# _C_DEBUG=$_C_DEBUG_LIGHT -fdebug-prefix-map=${ARCADIA_ROOT}=/-S -fdebug-prefix-map=$(TOOL_ROOT)=/-T
-# _C_DEBUG_CL=$_C_DEBUG -Xclang -fdebug-compilation-dir -Xclang /tmp
-# _YASM_DEBUG_LIGHT=--replace=${ARCADIA_BUILD_ROOT}=/-B
-# _YASM_DEBUG=$_YASM_DEBUG_LIGHT --replace=${ARCADIA_ROOT}=/-S --replace=$(TOOL_ROOT)=/-T
-# when ($FORCE_CONSISTENT_DEBUG == "yes") {
-#     when ($CLANG == "yes") {
-#         CL_DEBUG_INFO=$_C_DEBUG_CL
-#     }
-#     otherwise {
-#         CL_DEBUG_INFO=$_C_DEBUG
-#     }
-#     YASM_DEBUG_INFO=$_YASM_DEBUG
-# }
-# elsewhen ($CONSISTENT_DEBUG == "yes") {
-#     when ($CLANG == "yes") {
-#         CL_DEBUG_INFO_DISABLE_CACHE__NO_UID__=$_C_DEBUG_CL
-#     }
-#     otherwise {
-#         CL_DEBUG_INFO_DISABLE_CACHE__NO_UID__=$_C_DEBUG
-#     }
-#     YASM_DEBUG_INFO_DISABLE_CACHE__NO_UID__=$_YASM_DEBUG
-# }
-# elsewhen ($CONSISTENT_DEBUG_LIGHT == "yes") {
-#     when ($CLANG == "yes") {
-#         CL_DEBUG_INFO_DISABLE_CACHE__NO_UID__=$_C_DEBUG_LIGHT_CL
-#     }
-#     otherwise {
-#         CL_DEBUG_INFO_DISABLE_CACHE__NO_UID__=$_C_DEBUG_LIGHT
-#     }
-#     YASM_DEBUG_INFO_DISABLE_CACHE__NO_UID__=$_YASM_DEBUG_LIGHT
-# }
-#
-# _C_BUILTINS=-Wno-builtin-macro-redefined -D__DATE__="\"""Sep 31 2019""\"" -D__TIME__=\"00:00:00\"
-# when ($CLANG == "yes" && $_TC_VERSION_AT_LEAST_10 || $GCC == "yes" && $_TC_VERSION_AT_LEAST_8 == "yes") {
-#     # XXX does not support non-normalized paths
-#     _C_BUILTINS+=-fmacro-prefix-map=${ARCADIA_BUILD_ROOT}/= -fmacro-prefix-map=${ARCADIA_ROOT}/= -fmacro-prefix-map=$(TOOL_ROOT)/=
-# }
-# otherwise {
-#     # XXX this macro substitution breaks __FILE__ in included sources
-#     _C_BUILTINS+=-D__FILE__=\"${input;qe;rootrel:SRC}\"
-# }
-#
-# when ($FORCE_CONSISTENT_BUILD == "yes") {
-#     CL_MACRO_INFO=$_C_BUILTINS
-# }
-# elsewhen ($CONSISTENT_BUILD == "yes") {
-#     CL_MACRO_INFO_DISABLE_CACHE__NO_UID__=$_C_BUILTINS
-# }
-
 when ($FORCE_CONSISTENT_DEBUG == "yes") {
     when ($CLANG == "yes") {
         CL_DEBUG_INFO=-fdebug-prefix-map=${ARCADIA_BUILD_ROOT}=/-B -fdebug-prefix-map=${ARCADIA_ROOT}=/-S -fdebug-prefix-map=$(TOOL_ROOT)=/-T -Xclang -fdebug-compilation-dir -Xclang /tmp
@@ -404,41 +351,41 @@ when (($TIME_TRACE == "yes" || $COMPILER_TIME_TRACE == "yes") && $CLANG == "yes"
 
 _C_CPP_KV_STYLE=${requirements;hide:CC_REQUIREMENTS} ${hide;kv:"p CC"} ${hide;kv:"pc green"}
 _CPP_ARGS=\
-$CLANG_TIDY_ARGS \
-$YNDEXER_ARGS \
-$CXX_COMPILER \
-$C_FLAGS_PLATFORM \
-$GCC_COMPILE_FLAGS \
-$CXXFLAGS \
-$CL_MACRO_INFO \
-$CL_MACRO_INFO_DISABLE_CACHE__NO_UID__ \
-$_COMPILER_TIME_TRACE_FLAGS \
-$EXTRA_OUTPUT \
-$SRCFLAGS \
-$_LANG_CFLAGS_VALUE \
-${input:SRC} \
-$TOOLCHAIN_ENV \
-$YNDEXER_OUTPUT \
-&& $_COMPILER_TIME_TRACE_POSTPROCESS \
-$_C_CPP_KV_STYLE
+    $CLANG_TIDY_ARGS \
+    $YNDEXER_ARGS \
+    $CXX_COMPILER \
+    $C_FLAGS_PLATFORM \
+    $GCC_COMPILE_FLAGS \
+    $CXXFLAGS \
+    $CL_MACRO_INFO \
+    $CL_MACRO_INFO_DISABLE_CACHE__NO_UID__ \
+    $_COMPILER_TIME_TRACE_FLAGS \
+    $EXTRA_OUTPUT \
+    $SRCFLAGS \
+    $_LANG_CFLAGS_VALUE \
+    ${input:SRC} \
+    $TOOLCHAIN_ENV \
+    $YNDEXER_OUTPUT \
+    && $_COMPILER_TIME_TRACE_POSTPROCESS \
+    $_C_CPP_KV_STYLE
 
 _C_ARGS=\
-$CLANG_TIDY_ARGS \
-$YNDEXER_ARGS \
-$C_COMPILER \
-$C_FLAGS_PLATFORM \
-$GCC_COMPILE_FLAGS \
-$CFLAGS \
-$CL_MACRO_INFO \
-$CL_MACRO_INFO_DISABLE_CACHE__NO_UID__ \
-$_COMPILER_TIME_TRACE_FLAGS \
-$CONLYFLAGS \
-$EXTRA_OUTPUT \
-$SRCFLAGS \
-${input:SRC} \
-$TOOLCHAIN_ENV \
-$YNDEXER_OUTPUT \
-$_C_CPP_KV_STYLE
+    $CLANG_TIDY_ARGS \
+    $YNDEXER_ARGS \
+    $C_COMPILER \
+    $C_FLAGS_PLATFORM \
+    $GCC_COMPILE_FLAGS \
+    $CFLAGS \
+    $CL_MACRO_INFO \
+    $CL_MACRO_INFO_DISABLE_CACHE__NO_UID__ \
+    $_COMPILER_TIME_TRACE_FLAGS \
+    $CONLYFLAGS \
+    $EXTRA_OUTPUT \
+    $SRCFLAGS \
+    ${input:SRC} \
+    $TOOLCHAIN_ENV \
+    $YNDEXER_OUTPUT \
+    $_C_CPP_KV_STYLE
 
 ### _SRC_C_NODEPS_CMD is obtained from _C_ARGS by filtering the following elements:
 ### ${input:SRC}
@@ -453,13 +400,13 @@ $_C_CPP_KV_STYLE
 ###
 ### $GCC_COMPILE_FLAGS is substituted for $EXTRA_C_FLAGS -c -o ${OUTFILE} ${SRC} ${pre=-I:INC}
 _SRC_C_NODEPS_CMD=\
-$C_COMPILER \
-$C_FLAGS_PLATFORM \
-$EXTRA_C_FLAGS -c -o ${OUTFILE} ${SRC} ${pre=-I:INC} \
-$CFLAGS \
-$CONLYFLAGS \
-$TOOLCHAIN_ENV \
-$_C_CPP_KV_STYLE
+    $C_COMPILER \
+    $C_FLAGS_PLATFORM \
+    $EXTRA_C_FLAGS -c -o ${OUTFILE} ${SRC} ${pre=-I:INC} \
+    $CFLAGS \
+    $CONLYFLAGS \
+    $TOOLCHAIN_ENV \
+    $_C_CPP_KV_STYLE
 
 _SRC_CPP_CMD=$_CPP_ARGS
 _SRC_C_CMD=$_C_ARGS
diff --git a/build/conf/compilers/msvc_compiler.conf b/build/conf/compilers/msvc_compiler.conf
index a64c9a1eff..b57425ab02 100644
--- a/build/conf/compilers/msvc_compiler.conf
+++ b/build/conf/compilers/msvc_compiler.conf
@@ -62,36 +62,36 @@ _CXX_WARNINGS_CLANG_CL_2019=
 _CXX_WARNINGS_CLANG_CL_2019_IDE_MSVS=
 when ($CLANG_CL == "yes") {
     _C_WARNINGS_CLANG_CL=\
--Wno-bitwise-op-parentheses \
--Wno-dll-attribute-on-redeclaration \
--Wno-extern-initializer \
--Wno-format \
--Wno-ignored-pragma-optimize \
--Wno-inconsistent-dllimport \
--Wno-int-conversion \
--Wno-invalid-noreturn \
--Wno-logical-op-parentheses \
--Wno-macro-redefined \
--Wno-parentheses \
--Wno-pragma-pack \
--Wno-tautological-constant-out-of-range-compare \
--Wno-unknown-argument \
--Wno-unknown-warning-option
+        -Wno-bitwise-op-parentheses \
+        -Wno-dll-attribute-on-redeclaration \
+        -Wno-extern-initializer \
+        -Wno-format \
+        -Wno-ignored-pragma-optimize \
+        -Wno-inconsistent-dllimport \
+        -Wno-int-conversion \
+        -Wno-invalid-noreturn \
+        -Wno-logical-op-parentheses \
+        -Wno-macro-redefined \
+        -Wno-parentheses \
+        -Wno-pragma-pack \
+        -Wno-tautological-constant-out-of-range-compare \
+        -Wno-unknown-argument \
+        -Wno-unknown-warning-option
 
     _CXX_WARNINGS_CLANG_CL=\
--Woverloaded-virtual \
--Wimport-preprocessor-directive-pedantic \
--Wno-undefined-var-template
+        -Woverloaded-virtual \
+        -Wimport-preprocessor-directive-pedantic \
+        -Wno-undefined-var-template
 
     when ($_TC_VERSION_AT_LEAST_2019 == "yes") {
         _CXX_WARNINGS_CLANG_CL_2019=\
--Wno-deprecated-volatile \
--Wno-deprecated-anon-enum-enum-conversion \
--Wno-defaulted-function-deleted \
--Wno-deprecated-enum-enum-conversion \
--Wno-ambiguous-reversed-operator \
--Wno-deprecated-enum-float-conversion \
--Wno-pointer-to-int-cast
+            -Wno-deprecated-volatile \
+            -Wno-deprecated-anon-enum-enum-conversion \
+            -Wno-defaulted-function-deleted \
+            -Wno-deprecated-enum-enum-conversion \
+            -Wno-ambiguous-reversed-operator \
+            -Wno-deprecated-enum-float-conversion \
+            -Wno-pointer-to-int-cast
     }
 
     when ($IDE_MSVS == "yes") {
@@ -129,21 +129,21 @@ otherwise {
 }
 
 _C_DEFINES=\
-/DARCADIA_ROOT=${ARCADIA_ROOT} \
-/DARCADIA_BUILD_ROOT=${ARCADIA_BUILD_ROOT} \
-/DFAKEID=$CPP_FAKEID \
-/DWIN32 \
-/D_WIN32 \
-/D_WINDOWS \
-/D_CRT_SECURE_NO_WARNINGS \
-/D_CRT_NONSTDC_NO_WARNINGS \
-/D_USE_MATH_DEFINES \
-/D__STDC_CONSTANT_MACROS \
-/D__STDC_FORMAT_MACROS \
-/D_USING_V110_SDK71_ \
-/D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES \
-/DNOMINMAX \
-/DWIN32_LEAN_AND_MEAN
+    /DARCADIA_ROOT=${ARCADIA_ROOT} \
+    /DARCADIA_BUILD_ROOT=${ARCADIA_BUILD_ROOT} \
+    /DFAKEID=$CPP_FAKEID \
+    /DWIN32 \
+    /D_WIN32 \
+    /D_WINDOWS \
+    /D_CRT_SECURE_NO_WARNINGS \
+    /D_CRT_NONSTDC_NO_WARNINGS \
+    /D_USE_MATH_DEFINES \
+    /D__STDC_CONSTANT_MACROS \
+    /D__STDC_FORMAT_MACROS \
+    /D_USING_V110_SDK71_ \
+    /D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES \
+    /DNOMINMAX \
+    /DWIN32_LEAN_AND_MEAN
 
 _C_DEFINES+=$_DEFINES_ARCH
 _C_DEFINES+=$_DEFINES_WIN32_WINNT