Reverting r281609; it caused some build bots to break.

http://lab.llvm.org:8011/builders/llvm-clang-lld-x86_64-scei-ps4-ubuntu-fast/builds/20061/steps/test/logs/stdio

llvm-svn: 281612
This commit is contained in:
Aaron Ballman 2016-09-15 14:12:33 +00:00
parent aaabbbf886
commit bc2bbb2e29
2 changed files with 3 additions and 30 deletions

View File

@ -3240,17 +3240,8 @@ bool Sema::SemaBuiltinVAStartImpl(CallExpr *TheCall) {
Diag(TheCall->getArg(1)->getLocStart(),
diag::warn_second_arg_of_va_start_not_last_named_param);
else if (IsCRegister || Type->isReferenceType() ||
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));
}()) {
Type->isPromotableIntegerType() ||
Type->isSpecificBuiltinType(BuiltinType::Float)) {
unsigned Reason = 0;
if (Type->isReferenceType()) Reason = 1;
else if (IsCRegister) Reason = 2;

View File

@ -1,6 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s -triple i386-pc-unknown
// RUN: %clang_cc1 -fsyntax-only -verify %s
// RUN: %clang_cc1 -fsyntax-only -verify %s -triple x86_64-apple-darwin9
// RUN: %clang_cc1 -fsyntax-only -fms-compatibility -DMS -verify %s
void f1(int a)
{
@ -95,20 +94,3 @@ void f12(register int i, ...) { // expected-note {{parameter of type 'int' is d
__builtin_va_start(ap, i); // expected-warning {{passing a parameter declared with the 'register' keyword to 'va_start' has undefined behavior}}
__builtin_va_end(ap);
}
enum __attribute__((packed)) E1 {
one1
};
void f13(enum E1 e, ...) {
__builtin_va_list va;
__builtin_va_start(va, e);
#ifndef MS
// In Microsoft compatibility mode, all enum types are int, but in
// non-ms-compatibility mode, this enumeration type will undergo default
// argument promotions.
// expected-note@-7 {{parameter of type 'enum E1' is declared here}}
// expected-warning@-6 {{passing an object that undergoes default argument promotion to 'va_start' has undefined behavior}}
#endif
__builtin_va_end(va);
}