diff options
| -rw-r--r-- | lib/Lex/Lexer.cpp | 3 | ||||
| -rw-r--r-- | test/Parser/editor-placeholder-recovery.cpp | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/Lex/Lexer.cpp b/lib/Lex/Lexer.cpp index 9885ab9d3e..0c179c0fb8 100644 --- a/lib/Lex/Lexer.cpp +++ b/lib/Lex/Lexer.cpp @@ -3542,7 +3542,8 @@ LexNextToken: } else if (LangOpts.Digraphs && Char == '%') { // '<%' -> '{' CurPtr = ConsumeChar(CurPtr, SizeTmp, Result); Kind = tok::l_brace; - } else if (Char == '#' && lexEditorPlaceholder(Result, CurPtr)) { + } else if (Char == '#' && /*Not a trigraph*/ SizeTmp == 1 && + lexEditorPlaceholder(Result, CurPtr)) { return true; } else { Kind = tok::less; diff --git a/test/Parser/editor-placeholder-recovery.cpp b/test/Parser/editor-placeholder-recovery.cpp index 48c290ee9a..d68e087d6f 100644 --- a/test/Parser/editor-placeholder-recovery.cpp +++ b/test/Parser/editor-placeholder-recovery.cpp @@ -69,3 +69,7 @@ void Struct::method(<#Struct &x#>, noSupressionHere) { // expected-error {{unkno // expected-error@-2 {{editor placeholder in source file}} #endif } + +void handleTrigraph() { + <??=placeholder#> // expected-error {{expected expression}} expected-error {{expected expression}} expected-warning {{trigraph converted to '#' character}} +} |