diff options
| author | David Blaikie <dblaikie@gmail.com> | 2012-08-21 18:56:49 +0000 |
|---|---|---|
| committer | David Blaikie <dblaikie@gmail.com> | 2012-08-21 18:56:49 +0000 |
| commit | 377da4c6b78c0130fb6141313636c8fda7b60b72 (patch) | |
| tree | 4e698d641be7aaee1b8dfdd4f2146068cb8c0d02 | |
| parent | 04a42791609ea958bcb13c84e97118f1a3007eb9 (diff) | |
Use LLVM_BUILTIN_TRAP instead of lame volatile int traps.
(from a todo mentioned in r159469 & originally suggested by Chandler Carruth)
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@162302 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Lex/Pragma.cpp | 2 | ||||
| -rw-r--r-- | lib/Parse/ParseDecl.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/Lex/Pragma.cpp b/lib/Lex/Pragma.cpp index c9cc4adf40..b7f7d1d4a9 100644 --- a/lib/Lex/Pragma.cpp +++ b/lib/Lex/Pragma.cpp @@ -1009,7 +1009,7 @@ struct PragmaDebugHandler : public PragmaHandler { if (II->isStr("assert")) { llvm_unreachable("This is an assertion!"); } else if (II->isStr("crash")) { - *(volatile int*) 0x11 = 0; + LLVM_BUILTIN_TRAP; } else if (II->isStr("parser_crash")) { Token Crasher; Crasher.setKind(tok::annot_pragma_parser_crash); diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp index 4129950ea6..85d3f5a7da 100644 --- a/lib/Parse/ParseDecl.cpp +++ b/lib/Parse/ParseDecl.cpp @@ -4351,7 +4351,7 @@ void Parser::ParseDirectDeclarator(Declarator &D) { D.SetIdentifier(0, Tok.getLocation()); } else { if (Tok.getKind() == tok::annot_pragma_parser_crash) - *(volatile int*) 0x11 = 0; + LLVM_BUILTIN_TRAP; if (D.getContext() == Declarator::MemberContext) Diag(Tok, diag::err_expected_member_name_or_semi) << D.getDeclSpec().getSourceRange(); |