svn commit: r328145 - head/contrib/llvm/lib/Analysis

[Dimitry Andric]

Author: dim
Date: Thu Jan 18 21:44:07 2018
New Revision: 328145
URL: https://svnweb.freebsd.org/changeset/base/328145

Log:
  Pull in r322016 from upstream llvm trunk (by Sanjay Patel):
  
    [ValueTracking] remove overzealous assert
  
    The test is derived from a failing fuzz test:
    https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=5008
  
    Credit to @rksimon for pointing out the problem.
  
  This should fix "Bad flavor while matching min/max" errors when building
  the graphics/libsixel and science/kst2 ports.
  
  Reported by:	jbeich
  PR:		225268, 225269

Modified:
  head/contrib/llvm/lib/Analysis/ValueTracking.cpp

Modified: head/contrib/llvm/lib/Analysis/ValueTracking.cpp
==============================================================================
--- head/contrib/llvm/lib/Analysis/ValueTracking.cpp	Thu Jan 18 21:39:59 2018	(r328144)
+++ head/contrib/llvm/lib/Analysis/ValueTracking.cpp	Thu Jan 18 21:44:07 2018	(r328145)
@@ -4214,7 +4214,7 @@ static SelectPatternResult matchMinMaxOfMinMax(CmpInst
       break;
     return {SPF_UNKNOWN, SPNB_NA, false};
   default:
-    llvm_unreachable("Bad flavor while matching min/max");
+    return {SPF_UNKNOWN, SPNB_NA, false};
   }
 
   // a pred c ? m(a, b) : m(c, b) --> m(m(a, b), m(c, b))