Re: r310057 - Revert r304953 for release 5.0.0

2017-08-04 Thread Vitaly Buka via cfe-commits 
Probably not, r310056 fails as well

On Fri, Aug 4, 2017 at 3:19 PM, Vitaly Buka  wrote:

> Looks like it's causing
> http://lab.llvm.org:8011/builders/sanitizer-x86_64-
> linux-bootstrap/builds/1969/steps/build%20clang%2Fmsan/logs/stdio
>
> FAILED: lib/CodeGen/CMakeFiles/LLVMCodeGen.dir/MIRPrinter.cpp.o
> /mnt/b/sanitizer-buildbot2/sanitizer-x86_64-linux-bootstrap/build/llvm_build0/bin/clang++
>-DGTEST_HAS_RTTI=0 -D_DEBUG -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS 
> -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -Ilib/CodeGen 
> -I/mnt/b/sanitizer-buildbot2/sanitizer-x86_64-linux-bootstrap/build/llvm/lib/CodeGen
>  -Iinclude 
> -I/mnt/b/sanitizer-buildbot2/sanitizer-x86_64-linux-bootstrap/build/llvm/include
>  -nostdinc++ -isystem 
> /mnt/b/sanitizer-buildbot2/sanitizer-x86_64-linux-bootstrap/build/libcxx_build_msan/include
>  -isystem 
> /mnt/b/sanitizer-buildbot2/sanitizer-x86_64-linux-bootstrap/build/libcxx_build_msan/include/c++/v1
>   -lc++abi 
> -Wl,--rpath=/mnt/b/sanitizer-buildbot2/sanitizer-x86_64-linux-bootstrap/build/libcxx_build_msan/lib
>  
> -L/mnt/b/sanitizer-buildbot2/sanitizer-x86_64-linux-bootstrap/build/libcxx_build_msan/lib
>  -fsanitize=memory -w -stdlib=libc++ -fPIC -fvisibility-inlines-hidden 
> -Werror=date-time -std=c++11 -Wall -W -Wno-unused-parameter -Wwrite-strings 
> -Wcast-qual -Wmissing-field-initializers -pedantic -Wno-long-long 
> -Wcovered-switch-default -Wnon-virtual-dtor -Wdelete-non-virtual-dtor 
> -Wstring-conversion -fno-omit-frame-pointer -gline-tables-only 
> -fsanitize=memory -fcolor-diagnostics -ffunction-sections -fdata-sections -O3 
>-UNDEBUG  -fno-exceptions -fno-rtti -MD -MT 
> lib/CodeGen/CMakeFiles/LLVMCodeGen.dir/MIRPrinter.cpp.o -MF 
> lib/CodeGen/CMakeFiles/LLVMCodeGen.dir/MIRPrinter.cpp.o.d -o 
> lib/CodeGen/CMakeFiles/LLVMCodeGen.dir/MIRPrinter.cpp.o -c 
> /mnt/b/sanitizer-buildbot2/sanitizer-x86_64-linux-bootstrap/build/llvm/lib/CodeGen/MIRPrinter.cpp
> clang-5.0: 
> /mnt/b/sanitizer-buildbot2/sanitizer-x86_64-linux-bootstrap/build/llvm/include/llvm/Support/Casting.h:106:
>  static bool llvm::isa_impl_cl::doit(const From*) [with To = 
> llvm::ConstantInt; From = llvm::Value]: Assertion `Val && "isa<> used on a 
> null pointer"' failed.
> #0 0x020b5d4a llvm::sys::PrintStackTrace(llvm::raw_ostream&) 
> (/mnt/b/sanitizer-buildbot2/sanitizer-x86_64-linux-bootstrap/build/llvm_build0/bin/clang-5.0+0x20b5d4a)
> #1 0x020b3abe llvm::sys::RunSignalHandlers() 
> (/mnt/b/sanitizer-buildbot2/sanitizer-x86_64-linux-bootstrap/build/llvm_build0/bin/clang-5.0+0x20b3abe)
> #2 0x020b3c32 SignalHandler(int) 
> (/mnt/b/sanitizer-buildbot2/sanitizer-x86_64-linux-bootstrap/build/llvm_build0/bin/clang-5.0+0x20b3c32)
> #3 0x7f319d790390 __restore_rt 
> (/lib/x86_64-linux-gnu/libpthread.so.0+0x11390)
> #4 0x7f319c71c428 gsignal (/lib/x86_64-linux-gnu/libc.so.6+0x35428)
> #5 0x7f319c71e02a abort (/lib/x86_64-linux-gnu/libc.so.6+0x3702a)
> #6 0x7f319c714bd7 (/lib/x86_64-linux-gnu/libc.so.6+0x2dbd7)
> #7 0x7f319c714c82 (/lib/x86_64-linux-gnu/libc.so.6+0x2dc82)
> #8 0x0084f464 llvm::isa_impl_wrap const*, llvm::Value const*>::doit(llvm::Value const* const&) [clone 
> .isra.166] [clone .part.167] 
> (/mnt/b/sanitizer-buildbot2/sanitizer-x86_64-linux-bootstrap/build/llvm_build0/bin/clang-5.0+0x84f464)
> #9 0x01c35d4c llvm::Value::stripPointerCasts() const 
> (/mnt/b/sanitizer-buildbot2/sanitizer-x86_64-linux-bootstrap/build/llvm_build0/bin/clang-5.0+0x1c35d4c)
> #10 0x01e996e1 eliminateDeadStores(llvm::BasicBlock&, 
> llvm::AAResults*, llvm::MemoryDependenceResults*, llvm::DominatorTree*, 
> llvm::TargetLibraryInfo const*) 
> (/mnt/b/sanitizer-buildbot2/sanitizer-x86_64-linux-bootstrap/build/llvm_build0/bin/clang-5.0+0x1e996e1)
> #11 0x01e9ad2a eliminateDeadStores(llvm::Function&, llvm::AAResults*, 
> llvm::MemoryDependenceResults*, llvm::DominatorTree*, llvm::TargetLibraryInfo 
> const*) 
> (/mnt/b/sanitizer-buildbot2/sanitizer-x86_64-linux-bootstrap/build/llvm_build0/bin/clang-5.0+0x1e9ad2a)
> #12 0x01bff3a3 llvm::FPPassManager::runOnFunction(llvm::Function&) 
> (/mnt/b/sanitizer-buildbot2/sanitizer-x86_64-linux-bootstrap/build/llvm_build0/bin/clang-5.0+0x1bff3a3)
> #13 0x01bff46c llvm::FPPassManager::runOnModule(llvm::Module&) 
> (/mnt/b/sanitizer-buildbot2/sanitizer-x86_64-linux-bootstrap/build/llvm_build0/bin/clang-5.0+0x1bff46c)#14
>  0x01bfef0d llvm::legacy::PassManagerImpl::run(llvm::Module&) 
> (/mnt/b/sanitizer-buildbot2/sanitizer-x86_64-linux-bootstrap/build/llvm_build0/bin/clang-5.0+0x1bfef0d)
> #15 0x0225c6d1 clang::EmitBackendOutput(clang::DiagnosticsEngine&, 
> clang::HeaderSearchOptions const&, clang::CodeGenOptions const&, 
> clang::TargetOptions const&, clang::LangOptions const&, llvm::DataLayout 
> const&, llvm::Module*, clang::BackendAction, 
>

Re: r310057 - Revert r304953 for release 5.0.0

2017-08-04 Thread Vitaly Buka via cfe-commits 
Looks like it's causing
http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-bootstrap/builds/1969/steps/build%20clang%2Fmsan/logs/stdio

FAILED: lib/CodeGen/CMakeFiles/LLVMCodeGen.dir/MIRPrinter.cpp.o
/mnt/b/sanitizer-buildbot2/sanitizer-x86_64-linux-bootstrap/build/llvm_build0/bin/clang++
  -DGTEST_HAS_RTTI=0 -D_DEBUG -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS
-D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -Ilib/CodeGen
-I/mnt/b/sanitizer-buildbot2/sanitizer-x86_64-linux-bootstrap/build/llvm/lib/CodeGen
-Iinclude 
-I/mnt/b/sanitizer-buildbot2/sanitizer-x86_64-linux-bootstrap/build/llvm/include
-nostdinc++ -isystem
/mnt/b/sanitizer-buildbot2/sanitizer-x86_64-linux-bootstrap/build/libcxx_build_msan/include
-isystem 
/mnt/b/sanitizer-buildbot2/sanitizer-x86_64-linux-bootstrap/build/libcxx_build_msan/include/c++/v1
 -lc++abi 
-Wl,--rpath=/mnt/b/sanitizer-buildbot2/sanitizer-x86_64-linux-bootstrap/build/libcxx_build_msan/lib
-L/mnt/b/sanitizer-buildbot2/sanitizer-x86_64-linux-bootstrap/build/libcxx_build_msan/lib
-fsanitize=memory -w -stdlib=libc++ -fPIC -fvisibility-inlines-hidden
-Werror=date-time -std=c++11 -Wall -W -Wno-unused-parameter
-Wwrite-strings -Wcast-qual -Wmissing-field-initializers -pedantic
-Wno-long-long -Wcovered-switch-default -Wnon-virtual-dtor
-Wdelete-non-virtual-dtor -Wstring-conversion -fno-omit-frame-pointer
-gline-tables-only -fsanitize=memory -fcolor-diagnostics
-ffunction-sections -fdata-sections -O3-UNDEBUG  -fno-exceptions
-fno-rtti -MD -MT
lib/CodeGen/CMakeFiles/LLVMCodeGen.dir/MIRPrinter.cpp.o -MF
lib/CodeGen/CMakeFiles/LLVMCodeGen.dir/MIRPrinter.cpp.o.d -o
lib/CodeGen/CMakeFiles/LLVMCodeGen.dir/MIRPrinter.cpp.o -c
/mnt/b/sanitizer-buildbot2/sanitizer-x86_64-linux-bootstrap/build/llvm/lib/CodeGen/MIRPrinter.cpp
clang-5.0: 
/mnt/b/sanitizer-buildbot2/sanitizer-x86_64-linux-bootstrap/build/llvm/include/llvm/Support/Casting.h:106:
static bool llvm::isa_impl_cl::doit(const From*)
[with To = llvm::ConstantInt; From = llvm::Value]: Assertion `Val &&
"isa<> used on a null pointer"' failed.
#0 0x020b5d4a llvm::sys::PrintStackTrace(llvm::raw_ostream&)
(/mnt/b/sanitizer-buildbot2/sanitizer-x86_64-linux-bootstrap/build/llvm_build0/bin/clang-5.0+0x20b5d4a)
#1 0x020b3abe llvm::sys::RunSignalHandlers()
(/mnt/b/sanitizer-buildbot2/sanitizer-x86_64-linux-bootstrap/build/llvm_build0/bin/clang-5.0+0x20b3abe)
#2 0x020b3c32 SignalHandler(int)
(/mnt/b/sanitizer-buildbot2/sanitizer-x86_64-linux-bootstrap/build/llvm_build0/bin/clang-5.0+0x20b3c32)
#3 0x7f319d790390 __restore_rt
(/lib/x86_64-linux-gnu/libpthread.so.0+0x11390)
#4 0x7f319c71c428 gsignal (/lib/x86_64-linux-gnu/libc.so.6+0x35428)
#5 0x7f319c71e02a abort (/lib/x86_64-linux-gnu/libc.so.6+0x3702a)
#6 0x7f319c714bd7 (/lib/x86_64-linux-gnu/libc.so.6+0x2dbd7)
#7 0x7f319c714c82 (/lib/x86_64-linux-gnu/libc.so.6+0x2dc82)
#8 0x0084f464 llvm::isa_impl_wrap::doit(llvm::Value const*
const&) [clone .isra.166] [clone .part.167]
(/mnt/b/sanitizer-buildbot2/sanitizer-x86_64-linux-bootstrap/build/llvm_build0/bin/clang-5.0+0x84f464)
#9 0x01c35d4c llvm::Value::stripPointerCasts() const
(/mnt/b/sanitizer-buildbot2/sanitizer-x86_64-linux-bootstrap/build/llvm_build0/bin/clang-5.0+0x1c35d4c)
#10 0x01e996e1 eliminateDeadStores(llvm::BasicBlock&,
llvm::AAResults*, llvm::MemoryDependenceResults*,
llvm::DominatorTree*, llvm::TargetLibraryInfo const*)
(/mnt/b/sanitizer-buildbot2/sanitizer-x86_64-linux-bootstrap/build/llvm_build0/bin/clang-5.0+0x1e996e1)
#11 0x01e9ad2a eliminateDeadStores(llvm::Function&,
llvm::AAResults*, llvm::MemoryDependenceResults*,
llvm::DominatorTree*, llvm::TargetLibraryInfo const*)
(/mnt/b/sanitizer-buildbot2/sanitizer-x86_64-linux-bootstrap/build/llvm_build0/bin/clang-5.0+0x1e9ad2a)
#12 0x01bff3a3
llvm::FPPassManager::runOnFunction(llvm::Function&)
(/mnt/b/sanitizer-buildbot2/sanitizer-x86_64-linux-bootstrap/build/llvm_build0/bin/clang-5.0+0x1bff3a3)
#13 0x01bff46c llvm::FPPassManager::runOnModule(llvm::Module&)
(/mnt/b/sanitizer-buildbot2/sanitizer-x86_64-linux-bootstrap/build/llvm_build0/bin/clang-5.0+0x1bff46c)#14
0x01bfef0d llvm::legacy::PassManagerImpl::run(llvm::Module&)
(/mnt/b/sanitizer-buildbot2/sanitizer-x86_64-linux-bootstrap/build/llvm_build0/bin/clang-5.0+0x1bfef0d)
#15 0x0225c6d1
clang::EmitBackendOutput(clang::DiagnosticsEngine&,
clang::HeaderSearchOptions const&, clang::CodeGenOptions const&,
clang::TargetOptions const&, clang::LangOptions const&,
llvm::DataLayout const&, llvm::Module*, clang::BackendAction,
std::unique_ptr)
(/mnt/b/sanitizer-buildbot2/sanitizer-x86_64-linux-bootstrap/build/llvm_build0/bin/clang-5.0+0x225c6d1)
#16 0x029691a9
clang::BackendConsumer::HandleTranslationUnit(clang::ASTContext&)

r310057 - Revert r304953 for release 5.0.0

2017-08-04 Thread Stefan Maksimovic via cfe-commits 
Author: smaksimovic
Date: Fri Aug  4 05:37:34 2017
New Revision: 310057

URL: http://llvm.org/viewvc/llvm-project?rev=310057=rev
Log:
Revert r304953 for release 5.0.0

This is causing failures when compiling clang with -O3
as one of the structures used by clang is passed by
value and uses the fastcc calling convention.

Faliures manifest for stage2 mips build.

Removed:
cfe/trunk/test/CodeGen/mips-madd4.c
Modified:
cfe/trunk/include/clang/Driver/Options.td
cfe/trunk/lib/Basic/Targets/Mips.cpp
cfe/trunk/lib/Basic/Targets/Mips.h
cfe/trunk/lib/Driver/ToolChains/Arch/Mips.cpp
cfe/trunk/test/Preprocessor/init.c

Modified: cfe/trunk/include/clang/Driver/Options.td
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/Options.td?rev=310057=310056=310057=diff
==
--- cfe/trunk/include/clang/Driver/Options.td (original)
+++ cfe/trunk/include/clang/Driver/Options.td Fri Aug  4 05:37:34 2017
@@ -2019,10 +2019,6 @@ def mdspr2 : Flag<["-"], "mdspr2">, Grou
 def mno_dspr2 : Flag<["-"], "mno-dspr2">, Group;
 def msingle_float : Flag<["-"], "msingle-float">, Group;
 def mdouble_float : Flag<["-"], "mdouble-float">, Group;
-def mmadd4 : Flag<["-"], "mmadd4">, Group,
-  HelpText<"Enable the generation of 4-operand madd.s, madd.d and related 
instructions.">;
-def mno_madd4 : Flag<["-"], "mno-madd4">, Group,
-  HelpText<"Disable the generation of 4-operand madd.s, madd.d and related 
instructions.">;
 def mmsa : Flag<["-"], "mmsa">, Group,
   HelpText<"Enable MSA ASE (MIPS only)">;
 def mno_msa : Flag<["-"], "mno-msa">, Group,

Modified: cfe/trunk/lib/Basic/Targets/Mips.cpp
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Targets/Mips.cpp?rev=310057=310056=310057=diff
==
--- cfe/trunk/lib/Basic/Targets/Mips.cpp (original)
+++ cfe/trunk/lib/Basic/Targets/Mips.cpp Fri Aug  4 05:37:34 2017
@@ -166,9 +166,6 @@ void MipsTargetInfo::getTargetDefines(co
   if (HasMSA)
 Builder.defineMacro("__mips_msa", Twine(1));
 
-  if (DisableMadd4)
-Builder.defineMacro("__mips_no_madd4", Twine(1));
-
   Builder.defineMacro("_MIPS_SZPTR", Twine(getPointerWidth(0)));
   Builder.defineMacro("_MIPS_SZINT", Twine(getIntWidth()));
   Builder.defineMacro("_MIPS_SZLONG", Twine(getLongWidth()));

Modified: cfe/trunk/lib/Basic/Targets/Mips.h
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Targets/Mips.h?rev=310057=310056=310057=diff
==
--- cfe/trunk/lib/Basic/Targets/Mips.h (original)
+++ cfe/trunk/lib/Basic/Targets/Mips.h Fri Aug  4 05:37:34 2017
@@ -52,7 +52,6 @@ class LLVM_LIBRARY_VISIBILITY MipsTarget
   enum MipsFloatABI { HardFloat, SoftFloat } FloatABI;
   enum DspRevEnum { NoDSP, DSP1, DSP2 } DspRev;
   bool HasMSA;
-  bool DisableMadd4;
 
 protected:
   bool HasFP64;
@@ -63,7 +62,7 @@ public:
   : TargetInfo(Triple), IsMips16(false), IsMicromips(false),
 IsNan2008(false), IsSingleFloat(false), IsNoABICalls(false),
 CanUseBSDABICalls(false), FloatABI(HardFloat), DspRev(NoDSP),
-HasMSA(false), DisableMadd4(false), HasFP64(false) {
+HasMSA(false), HasFP64(false) {
 TheCXXABI.set(TargetCXXABI::GenericMIPS);
 
 setABI((getTriple().getArch() == llvm::Triple::mips ||
@@ -320,8 +319,6 @@ public:
 DspRev = std::max(DspRev, DSP2);
   else if (Feature == "+msa")
 HasMSA = true;
-  else if (Feature == "+nomadd4")
-DisableMadd4 = true;
   else if (Feature == "+fp64")
 HasFP64 = true;
   else if (Feature == "-fp64")

Modified: cfe/trunk/lib/Driver/ToolChains/Arch/Mips.cpp
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains/Arch/Mips.cpp?rev=310057=310056=310057=diff
==
--- cfe/trunk/lib/Driver/ToolChains/Arch/Mips.cpp (original)
+++ cfe/trunk/lib/Driver/ToolChains/Arch/Mips.cpp Fri Aug  4 05:37:34 2017
@@ -297,8 +297,6 @@ void mips::getMIPSTargetFeatures(const D
 
   AddTargetFeature(Args, Features, options::OPT_mno_odd_spreg,
options::OPT_modd_spreg, "nooddspreg");
-  AddTargetFeature(Args, Features, options::OPT_mno_madd4, options::OPT_mmadd4,
-   "nomadd4");
   AddTargetFeature(Args, Features, options::OPT_mlong_calls,
options::OPT_mno_long_calls, "long-calls");
   AddTargetFeature(Args, Features, options::OPT_mmt, options::OPT_mno_mt, 
"mt");

Removed: cfe/trunk/test/CodeGen/mips-madd4.c
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/mips-madd4.c?rev=310056=auto
==
--- cfe/trunk/test/CodeGen/mips-madd4.c (original)
+++ cfe/trunk/test/CodeGen/mips-madd4.c (removed)
@@ -1,87 +0,0 @@
-// REQUIRES: mips-registered-target
-//