Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 28 Aug 2016 19:28:01 +0000 (UTC)
From:      Dimitry Andric <dim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r304960 - projects/clang390-import/contrib/llvm/tools/clang/lib/Sema
Message-ID:  <201608281928.u7SJS1dV023988@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: dim
Date: Sun Aug 28 19:28:00 2016
New Revision: 304960
URL: https://svnweb.freebsd.org/changeset/base/304960

Log:
  Tentatively apply https://reviews.llvm.org/D23921, to get rid of false
  positive diagnostics from -Wvarargs about enum parameters, e.g.:
  
  cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c:388:15: error: passing an object that undergoes default argument promotion to 'va_start' has undefined behavior
        [-Werror,-Wvarargs]
          va_start(ap, which);
                       ^
  cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c:382:66: note: parameter of type 'enum nvlist_prtctl_fmt' is declared here
  nvlist_prtctl_dofmt(nvlist_prtctl_t pctl, enum nvlist_prtctl_fmt which, ...)
                                                                   ^

Modified:
  projects/clang390-import/contrib/llvm/tools/clang/lib/Sema/SemaChecking.cpp

Modified: projects/clang390-import/contrib/llvm/tools/clang/lib/Sema/SemaChecking.cpp
==============================================================================
--- projects/clang390-import/contrib/llvm/tools/clang/lib/Sema/SemaChecking.cpp	Sun Aug 28 18:10:29 2016	(r304959)
+++ projects/clang390-import/contrib/llvm/tools/clang/lib/Sema/SemaChecking.cpp	Sun Aug 28 19:28:00 2016	(r304960)
@@ -3189,8 +3189,17 @@ bool Sema::SemaBuiltinVAStartImpl(CallEx
     Diag(TheCall->getArg(1)->getLocStart(),
          diag::warn_second_arg_of_va_start_not_last_named_param);
   else if (IsCRegister || Type->isReferenceType() ||
-           Type->isPromotableIntegerType() ||
-           Type->isSpecificBuiltinType(BuiltinType::Float)) {
+           Type->isSpecificBuiltinType(BuiltinType::Float) || [=] {
+             // Promotable integers are UB, but enumerations need a bit of
+             // extra checking to see what their promotable type actually is.
+             if (!Type->isPromotableIntegerType())
+               return false;
+             if (!Type->isEnumeralType())
+               return true;
+             const EnumDecl *ED = Type->getAs<EnumType>()->getDecl();
+             return !(ED &&
+                      Context.typesAreCompatible(ED->getPromotionType(), Type));
+           }()) {
     unsigned Reason = 0;
     if (Type->isReferenceType())  Reason = 1;
     else if (IsCRegister)         Reason = 2;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608281928.u7SJS1dV023988>