Treat the Microsoft/Borland keyword "__except" as a context-sensitive
keyword, because both libstdc++ and libc++ use "__except" as an identifier. Fixes <rdar://problem/10322555>. llvm-svn: 142636
This commit is contained in:
parent
99cc8c01ee
commit
60060d6f8f
|
@ -485,7 +485,6 @@ KEYWORD(__ptr32 , KEYMS)
|
|||
KEYWORD(__w64 , KEYMS)
|
||||
KEYWORD(__uuidof , KEYMS | KEYBORLAND)
|
||||
KEYWORD(__try , KEYMS | KEYBORLAND)
|
||||
KEYWORD(__except , KEYMS | KEYBORLAND)
|
||||
KEYWORD(__finally , KEYMS | KEYBORLAND)
|
||||
KEYWORD(__leave , KEYMS | KEYBORLAND)
|
||||
KEYWORD(__int64 , KEYMS)
|
||||
|
|
|
@ -112,6 +112,9 @@ class Parser : public CodeCompletionHandler {
|
|||
IdentifierInfo *Ident__exception_info, *Ident___exception_info, *Ident_GetExceptionInfo; // __except filter expression
|
||||
IdentifierInfo *Ident__abnormal_termination, *Ident___abnormal_termination, *Ident_AbnormalTermination; // __finally
|
||||
|
||||
/// Contextual keywords for Microsoft extensions.
|
||||
IdentifierInfo *Ident__except;
|
||||
|
||||
/// Ident_super - IdentifierInfo for "super", to support fast
|
||||
/// comparison.
|
||||
IdentifierInfo *Ident_super;
|
||||
|
@ -179,6 +182,8 @@ class Parser : public CodeCompletionHandler {
|
|||
/// declaration is finished.
|
||||
DelayedCleanupPool TopLevelDeclCleanupPool;
|
||||
|
||||
IdentifierInfo *getSEHExceptKeyword();
|
||||
|
||||
public:
|
||||
Parser(Preprocessor &PP, Sema &Actions);
|
||||
~Parser();
|
||||
|
|
|
@ -355,7 +355,8 @@ StmtResult Parser::ParseSEHTryBlockCommon(SourceLocation TryLoc) {
|
|||
return move(TryBlock);
|
||||
|
||||
StmtResult Handler;
|
||||
if(Tok.is(tok::kw___except)) {
|
||||
if (Tok.is(tok::identifier) &&
|
||||
Tok.getIdentifierInfo() == getSEHExceptKeyword()) {
|
||||
SourceLocation Loc = ConsumeToken();
|
||||
Handler = ParseSEHExceptBlock(Loc);
|
||||
} else if (Tok.is(tok::kw___finally)) {
|
||||
|
@ -2037,10 +2038,13 @@ StmtResult Parser::ParseCXXTryBlockCommon(SourceLocation TryLoc) {
|
|||
return move(TryBlock);
|
||||
|
||||
// Borland allows SEH-handlers with 'try'
|
||||
if(Tok.is(tok::kw___except) || Tok.is(tok::kw___finally)) {
|
||||
|
||||
if((Tok.is(tok::identifier) &&
|
||||
Tok.getIdentifierInfo() == getSEHExceptKeyword()) ||
|
||||
Tok.is(tok::kw___finally)) {
|
||||
// TODO: Factor into common return ParseSEHHandlerCommon(...)
|
||||
StmtResult Handler;
|
||||
if(Tok.is(tok::kw___except)) {
|
||||
if(Tok.getIdentifierInfo() == getSEHExceptKeyword()) {
|
||||
SourceLocation Loc = ConsumeToken();
|
||||
Handler = ParseSEHExceptBlock(Loc);
|
||||
}
|
||||
|
|
|
@ -23,6 +23,14 @@
|
|||
#include "clang/AST/ASTConsumer.h"
|
||||
using namespace clang;
|
||||
|
||||
IdentifierInfo *Parser::getSEHExceptKeyword() {
|
||||
// __except is accepted as a (contextual) keyword
|
||||
if (!Ident__except && (getLang().MicrosoftExt || getLang().Borland))
|
||||
Ident__except = PP.getIdentifierInfo("__except");
|
||||
|
||||
return Ident__except;
|
||||
}
|
||||
|
||||
Parser::Parser(Preprocessor &pp, Sema &actions)
|
||||
: PP(pp), Actions(actions), Diags(PP.getDiagnostics()),
|
||||
GreaterThanIsOperator(true), ColonIsSacred(false),
|
||||
|
@ -431,6 +439,8 @@ void Parser::Initialize() {
|
|||
Ident_obsoleted = 0;
|
||||
Ident_unavailable = 0;
|
||||
|
||||
Ident__except = 0;
|
||||
|
||||
Ident__exception_code = Ident__exception_info = Ident__abnormal_termination = 0;
|
||||
Ident___exception_code = Ident___exception_info = Ident___abnormal_termination = 0;
|
||||
Ident_GetExceptionCode = Ident_GetExceptionInfo = Ident_AbnormalTermination = 0;
|
||||
|
|
|
@ -20,7 +20,7 @@ void __abnormal_termination();
|
|||
|
||||
#pragma sysheader end
|
||||
|
||||
DWORD FilterExpression(int);
|
||||
DWORD FilterExpression(int); // expected-note{{declared here}}
|
||||
DWORD FilterExceptionInformation(struct EXCEPTION_INFO*);
|
||||
|
||||
const char * NotFilterExpression();
|
||||
|
@ -47,7 +47,8 @@ void TEST() {
|
|||
} // expected-error{{expected '__except' or '__finally' block}}
|
||||
|
||||
void TEST() {
|
||||
__except ( FilterExpression() ) { // expected-error{{}}
|
||||
__except ( FilterExpression() ) { // expected-warning{{implicit declaration of function '__except' is invalid in C99}} \
|
||||
// expected-error{{too few arguments to function call, expected 1, have 0}}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -210,3 +210,6 @@ struct PR11150 {
|
|||
|
||||
int array[__is_abstract(X)? 1 : -1];
|
||||
};
|
||||
|
||||
void f() { int __except = 0; }
|
||||
|
||||
|
|
Loading…
Reference in New Issue