Skip to content

Commit 98f575f

Browse files
zygoloidtstellar
zygoloid
authored and
tstellar
committed
Don't reject calls to MinGW's unusual _setjmp declaration.
We now recognize this function as a builtin despite it having an unexpected number of parameters; make sure we don't enforce that it has only 1 argument for its 2 parameters.
1 parent 0312bec commit 98f575f

File tree

4 files changed

+52
-23
lines changed

4 files changed

+52
-23
lines changed

‎clang/include/clang/Basic/Builtins.def

+1
Original file line numberDiff line numberDiff line change
@@ -1025,6 +1025,7 @@ LIBBUILTIN(pthread_create, "", "fC<2,3>", "pthread.h", ALL_GNU_LANGUAGES)
10251025

10261026
// POSIX setjmp.h
10271027

1028+
// FIXME: MinGW _setjmp has an additional void* parameter.
10281029
LIBBUILTIN(_setjmp, "iJ", "fjT", "setjmp.h", ALL_LANGUAGES)
10291030
LIBBUILTIN(__sigsetjmp, "iSJi", "fjT", "setjmp.h", ALL_LANGUAGES)
10301031
LIBBUILTIN(sigsetjmp, "iSJi", "fjT", "setjmp.h", ALL_LANGUAGES)

‎clang/lib/CodeGen/CGBuiltin.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -3754,11 +3754,13 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
37543754
case Builtin::BI_abnormal_termination:
37553755
return RValue::get(EmitSEHAbnormalTermination());
37563756
case Builtin::BI_setjmpex:
3757-
if (getTarget().getTriple().isOSMSVCRT())
3757+
if (getTarget().getTriple().isOSMSVCRT() && E->getNumArgs() == 1 &&
3758+
E->getArg(0)->getType()->isPointerType())
37583759
return EmitMSVCRTSetJmp(*this, MSVCSetJmpKind::_setjmpex, E);
37593760
break;
37603761
case Builtin::BI_setjmp:
3761-
if (getTarget().getTriple().isOSMSVCRT()) {
3762+
if (getTarget().getTriple().isOSMSVCRT() && E->getNumArgs() == 1 &&
3763+
E->getArg(0)->getType()->isPointerType()) {
37623764
if (getTarget().getTriple().getArch() == llvm::Triple::x86)
37633765
return EmitMSVCRTSetJmp(*this, MSVCSetJmpKind::_setjmp3, E);
37643766
else if (getTarget().getTriple().getArch() == llvm::Triple::aarch64)

‎clang/lib/Sema/SemaChecking.cpp

-5
Original file line numberDiff line numberDiff line change
@@ -1573,11 +1573,6 @@ Sema::CheckBuiltinFunctionCall(FunctionDecl *FDecl, unsigned BuiltinID,
15731573
if (SemaBuiltinSetjmp(TheCall))
15741574
return ExprError();
15751575
break;
1576-
case Builtin::BI_setjmp:
1577-
case Builtin::BI_setjmpex:
1578-
if (checkArgCount(*this, TheCall, 1))
1579-
return true;
1580-
break;
15811576
case Builtin::BI__builtin_classify_type:
15821577
if (checkArgCount(*this, TheCall, 1)) return true;
15831578
TheCall->setType(Context.IntTy);

‎clang/test/Sema/builtin-setjmp.c

+47-16
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,47 @@
1-
// RUN: %clang_cc1 -triple x86_64-unknown-unknown -fsyntax-only -verify -DNO_JMP_BUF %s -ast-dump | FileCheck %s
2-
// RUN: %clang_cc1 -triple x86_64-unknown-unknown -fsyntax-only -verify -DWRONG_JMP_BUF %s -ast-dump | FileCheck %s
3-
// RUN: %clang_cc1 -triple x86_64-unknown-unknown -fsyntax-only -verify -DRIGHT_JMP_BUF %s -ast-dump | FileCheck %s
4-
// RUN: %clang_cc1 -triple x86_64-unknown-unknown -fsyntax-only -verify -DONLY_JMP_BUF %s -ast-dump | FileCheck %s
5-
// RUN: %clang_cc1 -triple x86_64-unknown-unknown -fsyntax-only -verify -DNO_SETJMP %s -ast-dump 2>&1 | FileCheck %s
1+
// RUN: %clang_cc1 -triple x86_64-unknown-unknown -fsyntax-only -verify=c,expected -DNO_JMP_BUF %s -ast-dump | FileCheck %s --check-prefixes=CHECK1,CHECK2
2+
// RUN: %clang_cc1 -triple x86_64-unknown-unknown -fsyntax-only -verify=c,expected -DWRONG_JMP_BUF %s -ast-dump | FileCheck %s --check-prefixes=CHECK1,CHECK2
3+
// RUN: %clang_cc1 -triple x86_64-unknown-unknown -fsyntax-only -verify=c,expected -DRIGHT_JMP_BUF %s -ast-dump | FileCheck %s --check-prefixes=CHECK1,CHECK2
4+
// RUN: %clang_cc1 -triple x86_64-unknown-unknown -fsyntax-only -verify=c,expected -DONLY_JMP_BUF %s -ast-dump | FileCheck %s --check-prefixes=CHECK1,CHECK2
5+
// RUN: %clang_cc1 -triple x86_64-unknown-unknown -fsyntax-only -verify=c,expected -DNO_SETJMP %s -ast-dump 2>&1 | FileCheck %s --check-prefixes=CHECK1,CHECK2
6+
// RUN: %clang_cc1 -triple x86_64-unknown-unknown -fsyntax-only -verify=cxx,expected -x c++ -DNO_JMP_BUF %s -ast-dump | FileCheck %s --check-prefixes=CHECK1,CHECK2
7+
// RUN: %clang_cc1 -triple x86_64-unknown-unknown -fsyntax-only -verify=cxx,expected -x c++ -DWRONG_JMP_BUF %s -ast-dump | FileCheck %s --check-prefixes=CHECK1,CHECK2
8+
// RUN: %clang_cc1 -triple x86_64-unknown-unknown -fsyntax-only -verify=cxx,expected -x c++ -DRIGHT_JMP_BUF %s -ast-dump | FileCheck %s --check-prefixes=CHECK1,CHECK2
9+
// RUN: %clang_cc1 -triple x86_64-unknown-unknown -fsyntax-only -verify=cxx,expected -x c++ -DONLY_JMP_BUF %s -ast-dump | FileCheck %s --check-prefixes=CHECK2
10+
// RUN: %clang_cc1 -triple x86_64-unknown-unknown -fsyntax-only -verify=cxx,expected -x c++ -DNO_SETJMP %s -ast-dump | FileCheck %s --check-prefixes=CHECK2
11+
12+
#ifdef __cplusplus
13+
extern "C" {
14+
#endif
615

716
#ifdef NO_JMP_BUF
817
// This happens in some versions of glibc: the declaration of __sigsetjmp
918
// precedes the declaration of sigjmp_buf.
1019
extern long setjmp(long *); // Can't check, so we trust that this is the right type
1120
// FIXME: We could still diagnose the missing `jmp_buf` at the point of the call.
12-
// expected-no-diagnostics
21+
// c-no-diagnostics
1322
#elif WRONG_JMP_BUF
1423
typedef long jmp_buf;
15-
extern int setjmp(char); // expected-warning {{incompatible redeclaration of library function 'setjmp'}}
16-
// expected-note@-1 {{'setjmp' is a builtin with type 'int (jmp_buf)' (aka 'int (long)')}}
24+
// FIXME: Consider producing a similar warning in C++.
25+
extern int setjmp(char); // c-warning {{incompatible redeclaration of library function 'setjmp'}}
26+
// c-note@-1 {{'setjmp' is a builtin with type 'int (jmp_buf)' (aka 'int (long)')}}
1727
#elif RIGHT_JMP_BUF
1828
typedef long jmp_buf;
1929
extern int setjmp(long); // OK, right type.
20-
// expected-no-diagnostics
2130
#elif ONLY_JMP_BUF
2231
typedef int *jmp_buf;
2332
#endif
2433

2534
void use() {
2635
setjmp(0);
27-
#ifdef NO_SETJMP
28-
// expected-warning@-2 {{implicit declaration of function 'setjmp' is invalid in C99}}
36+
#if NO_SETJMP
37+
// cxx-error@-2 {{undeclared identifier 'setjmp'}}
38+
// c-warning@-3 {{implicit declaration of function 'setjmp' is invalid in C99}}
2939
#elif ONLY_JMP_BUF
30-
// expected-warning@-4 {{implicitly declaring library function 'setjmp' with type 'int (jmp_buf)' (aka 'int (int *)')}}
31-
// expected-note@-5 {{include the header <setjmp.h> or explicitly provide a declaration for 'setjmp'}}
40+
// cxx-error@-5 {{undeclared identifier 'setjmp'}}
41+
// c-warning@-6 {{implicitly declaring library function 'setjmp' with type 'int (jmp_buf)' (aka 'int (int *)')}}
42+
// c-note@-7 {{include the header <setjmp.h> or explicitly provide a declaration for 'setjmp'}}
43+
#else
44+
// cxx-no-diagnostics
3245
#endif
3346

3447
#ifdef NO_SETJMP
@@ -37,6 +50,24 @@ void use() {
3750
#endif
3851
}
3952

40-
// CHECK: FunctionDecl {{.*}} used setjmp
41-
// CHECK: BuiltinAttr {{.*}} Implicit
42-
// CHECK: ReturnsTwiceAttr {{.*}} Implicit
53+
// CHECK1: FunctionDecl {{.*}} used setjmp
54+
// CHECK1: BuiltinAttr {{.*}} Implicit
55+
// CHECK1: ReturnsTwiceAttr {{.*}} Implicit
56+
57+
// mingw declares _setjmp with an unusual signature.
58+
int _setjmp(void *, void *);
59+
#if !defined(NO_JMP_BUF) && !defined(NO_SETJMP)
60+
// c-warning@-2 {{incompatible redeclaration of library function '_setjmp'}}
61+
// c-note@-3 {{'_setjmp' is a builtin with type 'int (jmp_buf)'}}
62+
#endif
63+
void use_mingw() {
64+
_setjmp(0, 0);
65+
}
66+
67+
// CHECK2: FunctionDecl {{.*}} used _setjmp
68+
// CHECK2: BuiltinAttr {{.*}} Implicit
69+
// CHECK2: ReturnsTwiceAttr {{.*}} Implicit
70+
71+
#ifdef __cplusplus
72+
}
73+
#endif

0 commit comments

Comments
 (0)