MFC r263312:

Pull in r196939 from upstream llvm trunk (by Reid Kleckner):

  Reland "Fix miscompile of MS inline assembly with stack realignment"

  This re-lands commit r196876, which was reverted in r196879.

  The tests have been fixed to pass on platforms with a stack alignment
  larger than 4.

  Update to clang side tests will land shortly.

Pull in r196986 from upstream llvm trunk (by Reid Kleckner):

  Revert the backend fatal error from r196939

  The combination of inline asm, stack realignment, and dynamic allocas
  turns out to be too common to reject out of hand.

  ASan inserts empy inline asm fragments and uses aligned allocas.
  Compiling any trivial function containing a dynamic alloca with ASan is
  enough to trigger the check.

  XFAIL the test cases that would be miscompiled and add one that uses the
  relevant functionality.

Pull in r202930 from upstream llvm trunk (by Hans Wennborg):

  Check for dynamic allocas and inline asm that clobbers sp before building
  selection dag (PR19012)

  In X86SelectionDagInfo::EmitTargetCodeForMemcpy we check with MachineFrameInfo
  to make sure that ESI isn't used as a base pointer register before we choose to
  emit rep movs (which clobbers esi).

  The problem is that MachineFrameInfo wouldn't know about dynamic allocas or
  inline asm that clobbers the stack pointer until SelectionDAGBuilder has
  encountered them.

  This patch fixes the problem by checking for such things when building the
  FunctionLoweringInfo.

  Differential Revision: http://llvm-reviews.chandlerc.com/D2954

Together, these commits fix the problem encountered in the devel/emacs
port on the i386 architecture, where a combination of stack realignment,
alloca() and memcpy() could incidentally clobber the %esi register,
leading to segfaults in the temacs build-time utility.

See also: http://llvm.org/PR18171 and http://llvm.org/PR19012

Reported by:	ashish
PR:		ports/183064

MFC r263313:

Pull in r203311 from upstream llvm trunk (by Arnold Schwaighofer):

  ISel: Make VSELECT selection terminate in cases where the condition type has to
  be split and the result type widened.

  When the condition of a vselect has to be split it makes no sense widening the
  vselect and thereby widening the condition. We end up in an endless loop of
  widening (vselect result type) and splitting (condition mask type) doing this.
  Instead, split both the condition and the vselect and widen the result.

  I ran this over the test suite with i686 and mattr=+sse and saw no regressions.

  Fixes PR18036.

With this fix the original problem case from the graphics/rawtherapee
port (posted in http://llvm.org/PR18036 ) now compiles within ~97MB RSS.

Reported by:	mandree

MFC r263320:

Add separate patch files for all the customizations we have currently
applied to our copy of llvm/clang.  These can be applied in alphabetical
order to a pristine llvm/clang 3.4 release source tree, to result in the
same version used in FreeBSD.

This is intended to clearly document all the changes until now, which
mostly consist of cherry pickings from the respective upstream trunks,
plus a number of hand-written FreeBSD-specific ones.  Hopefully those
can eventually be cleaned up and sent upstream too.

1 files changed, 214 insertions, 0 deletions

diff --git a/contrib/llvm/patches/patch-r208987-format-extensions.diff b/contrib/llvm/patches/patch-r208987-format-extensions.diff
new file mode 100644
index 0000000..b01553e
--- /dev/null
+++ b/contrib/llvm/patches/patch-r208987-format-extensions.diff
@@ -0,0 +1,214 @@
+This patch adds support for the FreeBSD-specific -fformat-extension option,
+which enables additional printf modifiers for the kernel.
+
+Introduced here: http://svn.freebsd.org/changeset/base/208987
+
+Index: tools/clang/lib/Frontend/CompilerInvocation.cpp
+===================================================================
+--- tools/clang/lib/Frontend/CompilerInvocation.cpp
++++ tools/clang/lib/Frontend/CompilerInvocation.cpp
+@@ -1319,6 +1319,7 @@ static void ParseLangArgs(LangOptions &Opts, ArgLi
+   Opts.ShortWChar = Args.hasArg(OPT_fshort_wchar);
+   Opts.ShortEnums = Args.hasArg(OPT_fshort_enums);
+   Opts.Freestanding = Args.hasArg(OPT_ffreestanding);
++  Opts.FormatExtensions = Args.hasArg(OPT_fformat_extensions);
+   Opts.NoBuiltin = Args.hasArg(OPT_fno_builtin) || Opts.Freestanding;
+   Opts.NoMathBuiltin = Args.hasArg(OPT_fno_math_builtin);
+   Opts.AssumeSaneOperatorNew = !Args.hasArg(OPT_fno_assume_sane_operator_new);
+Index: tools/clang/lib/Analysis/FormatString.cpp
+===================================================================
+--- tools/clang/lib/Analysis/FormatString.cpp
++++ tools/clang/lib/Analysis/FormatString.cpp
+@@ -548,6 +548,11 @@ const char *ConversionSpecifier::toString() const
+   // Objective-C specific specifiers.
+   case ObjCObjArg: return "@";
+ 
++  // FreeBSD specific specifiers.
++  case FreeBSDbArg: return "b";
++  case FreeBSDDArg: return "D";
++  case FreeBSDrArg: return "r";
++
+   // GlibC specific specifiers.
+   case PrintErrno: return "m";
+   }
+@@ -626,6 +631,7 @@ bool FormatSpecifier::hasValidLengthModifier(const
+         case ConversionSpecifier::xArg:
+         case ConversionSpecifier::XArg:
+         case ConversionSpecifier::nArg:
++        case ConversionSpecifier::FreeBSDrArg:
+           return true;
+         default:
+           return false;
+@@ -654,6 +660,7 @@ bool FormatSpecifier::hasValidLengthModifier(const
+         case ConversionSpecifier::nArg:
+         case ConversionSpecifier::cArg:
+         case ConversionSpecifier::sArg:
++        case ConversionSpecifier::FreeBSDrArg:
+         case ConversionSpecifier::ScanListArg:
+           return true;
+         default:
+@@ -774,6 +781,9 @@ bool FormatSpecifier::hasStandardConversionSpecifi
+     case ConversionSpecifier::SArg:
+       return LangOpt.ObjC1 || LangOpt.ObjC2;
+     case ConversionSpecifier::InvalidSpecifier:
++    case ConversionSpecifier::FreeBSDbArg:
++    case ConversionSpecifier::FreeBSDDArg:
++    case ConversionSpecifier::FreeBSDrArg:
+     case ConversionSpecifier::PrintErrno:
+     case ConversionSpecifier::DArg:
+     case ConversionSpecifier::OArg:
+Index: tools/clang/lib/Analysis/PrintfFormatString.cpp
+===================================================================
+--- tools/clang/lib/Analysis/PrintfFormatString.cpp
++++ tools/clang/lib/Analysis/PrintfFormatString.cpp
+@@ -198,10 +198,25 @@ static PrintfSpecifierResult ParsePrintfSpecifier(
+     case '@': k = ConversionSpecifier::ObjCObjArg; break;
+     // Glibc specific.
+     case 'm': k = ConversionSpecifier::PrintErrno; break;
++    // FreeBSD format extensions
++    case 'b':
++      if (LO.FormatExtensions)
++        k = ConversionSpecifier::FreeBSDbArg; // int followed by char *
++      break;
++    case 'r':
++      if (LO.FormatExtensions)
++        k = ConversionSpecifier::FreeBSDrArg;
++      break;
++    case 'y':
++      if (LO.FormatExtensions)
++        k = ConversionSpecifier::iArg;
++      break;
+     // Apple-specific
+     case 'D':
+       if (Target.getTriple().isOSDarwin())
+         k = ConversionSpecifier::DArg;
++      else if (LO.FormatExtensions)
++        k = ConversionSpecifier::FreeBSDDArg; // u_char * followed by char *
+       break;
+     case 'O':
+       if (Target.getTriple().isOSDarwin())
+@@ -216,6 +231,10 @@ static PrintfSpecifierResult ParsePrintfSpecifier(
+   FS.setConversionSpecifier(CS);
+   if (CS.consumesDataArgument() && !FS.usesPositionalArg())
+     FS.setArgIndex(argIndex++);
++  // FreeBSD extension
++  if (k == ConversionSpecifier::FreeBSDbArg ||
++      k == ConversionSpecifier::FreeBSDDArg)
++    argIndex++;
+ 
+   if (k == ConversionSpecifier::InvalidSpecifier) {
+     // Assume the conversion takes one argument.
+@@ -618,6 +637,7 @@ bool PrintfSpecifier::hasValidPlusPrefix() const {
+   case ConversionSpecifier::GArg:
+   case ConversionSpecifier::aArg:
+   case ConversionSpecifier::AArg:
++  case ConversionSpecifier::FreeBSDrArg:
+     return true;
+ 
+   default:
+@@ -643,6 +663,7 @@ bool PrintfSpecifier::hasValidAlternativeForm() co
+   case ConversionSpecifier::FArg:
+   case ConversionSpecifier::gArg:
+   case ConversionSpecifier::GArg:
++  case ConversionSpecifier::FreeBSDrArg:
+     return true;
+ 
+   default:
+Index: tools/clang/lib/Sema/SemaChecking.cpp
+===================================================================
+--- tools/clang/lib/Sema/SemaChecking.cpp
++++ tools/clang/lib/Sema/SemaChecking.cpp
+@@ -2980,6 +2980,40 @@ CheckPrintfHandler::HandlePrintfSpecifier(const an
+     CoveredArgs.set(argIndex);
+   }
+ 
++  // FreeBSD extensions
++  if (CS.getKind() == ConversionSpecifier::FreeBSDbArg ||
++      CS.getKind() == ConversionSpecifier::FreeBSDDArg) { 
++    // claim the second argument
++    CoveredArgs.set(argIndex + 1);
++
++    // Now type check the data expression that matches the
++    // format specifier.
++    const Expr *Ex = getDataArg(argIndex);
++    const analyze_printf::ArgType &AT = 
++      (CS.getKind() == ConversionSpecifier::FreeBSDbArg) ?
++        ArgType(S.Context.IntTy) : ArgType::CStrTy;
++    if (AT.isValid() && !AT.matchesType(S.Context, Ex->getType()))
++      S.Diag(getLocationOfByte(CS.getStart()),
++             diag::warn_printf_conversion_argument_type_mismatch)
++        << AT.getRepresentativeType(S.Context) << Ex->getType()
++        << getSpecifierRange(startSpecifier, specifierLen)
++        << Ex->getSourceRange();
++
++    // Now type check the data expression that matches the
++    // format specifier.
++    Ex = getDataArg(argIndex + 1);
++    const analyze_printf::ArgType &AT2 = ArgType::CStrTy;
++    if (AT2.isValid() && !AT2.matchesType(S.Context, Ex->getType()))
++      S.Diag(getLocationOfByte(CS.getStart()),
++             diag::warn_printf_conversion_argument_type_mismatch)
++        << AT2.getRepresentativeType(S.Context) << Ex->getType()
++        << getSpecifierRange(startSpecifier, specifierLen)
++        << Ex->getSourceRange();
++
++     return true;
++  }
++  // END OF FREEBSD EXTENSIONS
++
+   // Check for using an Objective-C specific conversion specifier
+   // in a non-ObjC literal.
+   if (!ObjCContext && CS.isObjCArg()) {
+Index: tools/clang/lib/Driver/Tools.cpp
+===================================================================
+--- tools/clang/lib/Driver/Tools.cpp
++++ tools/clang/lib/Driver/Tools.cpp
+@@ -2991,6 +2991,7 @@ void Clang::ConstructJob(Compilation &C, const Job
+ 
+   // Forward -f (flag) options which we can pass directly.
+   Args.AddLastArg(CmdArgs, options::OPT_femit_all_decls);
++  Args.AddLastArg(CmdArgs, options::OPT_fformat_extensions);
+   Args.AddLastArg(CmdArgs, options::OPT_fheinous_gnu_extensions);
+   Args.AddLastArg(CmdArgs, options::OPT_flimit_debug_info);
+   Args.AddLastArg(CmdArgs, options::OPT_fno_limit_debug_info);
+Index: tools/clang/include/clang/Basic/LangOptions.def
+===================================================================
+--- tools/clang/include/clang/Basic/LangOptions.def
++++ tools/clang/include/clang/Basic/LangOptions.def
+@@ -84,6 +84,7 @@ LANGOPT(TraditionalCPP    , 1, 0, "traditional CPP
+ LANGOPT(RTTI              , 1, 1, "run-time type information")
+ LANGOPT(MSBitfields       , 1, 0, "Microsoft-compatible structure layout")
+ LANGOPT(Freestanding, 1, 0, "freestanding implementation")
++LANGOPT(FormatExtensions  , 1, 0, "FreeBSD format extensions")
+ LANGOPT(NoBuiltin         , 1, 0, "disable builtin functions")
+ LANGOPT(NoMathBuiltin     , 1, 0, "disable math builtin functions")
+ 
+Index: tools/clang/include/clang/Analysis/Analyses/FormatString.h
+===================================================================
+--- tools/clang/include/clang/Analysis/Analyses/FormatString.h
++++ tools/clang/include/clang/Analysis/Analyses/FormatString.h
+@@ -158,6 +158,11 @@ class ConversionSpecifier {
+     ObjCObjArg,  // '@'
+     ObjCBeg = ObjCObjArg, ObjCEnd = ObjCObjArg,
+ 
++    // FreeBSD specific specifiers
++    FreeBSDbArg,
++    FreeBSDDArg,
++    FreeBSDrArg,
++
+     // GlibC specific specifiers.
+     PrintErrno,   // 'm'
+ 
+Index: tools/clang/include/clang/Driver/Options.td
+===================================================================
+--- tools/clang/include/clang/Driver/Options.td
++++ tools/clang/include/clang/Driver/Options.td
+@@ -530,6 +530,8 @@ def fno_rewrite_includes : Flag<["-"], "fno-rewrit
+ 
+ def ffreestanding : Flag<["-"], "ffreestanding">, Group<f_Group>, Flags<[CC1Option]>,
+   HelpText<"Assert that the compilation takes place in a freestanding environment">;
++def fformat_extensions: Flag<["-"], "fformat-extensions">, Group<f_Group>, Flags<[CC1Option]>,
++  HelpText<"Enable FreeBSD kernel specific format string extensions">;
+ def fgnu_keywords : Flag<["-"], "fgnu-keywords">, Group<f_Group>, Flags<[CC1Option]>,
+   HelpText<"Allow GNU-extension keywords regardless of language standard">;
+ def fgnu89_inline : Flag<["-"], "fgnu89-inline">, Group<f_Group>, Flags<[CC1Option]>,