Blame SOURCES/gcc11-Wbidi-chars.patch

44ce1d
commit 51c500269bf53749b107807d84271385fad35628
44ce1d
Author: Marek Polacek <polacek@redhat.com>
44ce1d
Date:   Wed Oct 6 14:33:59 2021 -0400
f9e3de
44ce1d
    libcpp: Implement -Wbidi-chars for CVE-2021-42574 [PR103026]
44ce1d
    
44ce1d
    From a link below:
44ce1d
    "An issue was discovered in the Bidirectional Algorithm in the Unicode
44ce1d
    Specification through 14.0. It permits the visual reordering of
44ce1d
    characters via control sequences, which can be used to craft source code
44ce1d
    that renders different logic than the logical ordering of tokens
44ce1d
    ingested by compilers and interpreters. Adversaries can leverage this to
44ce1d
    encode source code for compilers accepting Unicode such that targeted
44ce1d
    vulnerabilities are introduced invisibly to human reviewers."
44ce1d
    
44ce1d
    More info:
44ce1d
    https://nvd.nist.gov/vuln/detail/CVE-2021-42574
44ce1d
    https://trojansource.codes/
44ce1d
    
44ce1d
    This is not a compiler bug.  However, to mitigate the problem, this patch
44ce1d
    implements -Wbidi-chars=[none|unpaired|any] to warn about possibly
44ce1d
    misleading Unicode bidirectional control characters the preprocessor may
44ce1d
    encounter.
44ce1d
    
44ce1d
    The default is =unpaired, which warns about improperly terminated
44ce1d
    bidirectional control characters; e.g. a LRE without its corresponding PDF.
44ce1d
    The level =any warns about any use of bidirectional control characters.
44ce1d
    
44ce1d
    This patch handles both UCNs and UTF-8 characters.  UCNs designating
44ce1d
    bidi characters in identifiers are accepted since r204886.  Then r217144
44ce1d
    enabled -fextended-identifiers by default.  Extended characters in C/C++
44ce1d
    identifiers have been accepted since r275979.  However, this patch still
44ce1d
    warns about mixing UTF-8 and UCN bidi characters; there seems to be no
44ce1d
    good reason to allow mixing them.
44ce1d
    
44ce1d
    We warn in different contexts: comments (both C and C++-style), string
44ce1d
    literals, character constants, and identifiers.  Expectedly, UCNs are ignored
44ce1d
    in comments and raw string literals.  The bidirectional control characters
44ce1d
    can nest so this patch handles that as well.
44ce1d
    
44ce1d
    I have not included nor tested this at all with Fortran (which also has
44ce1d
    string literals and line comments).
44ce1d
    
44ce1d
    Dave M. posted patches improving diagnostic involving Unicode characters.
44ce1d
    This patch does not make use of this new infrastructure yet.
44ce1d
    
44ce1d
            PR preprocessor/103026
44ce1d
    
44ce1d
    gcc/c-family/ChangeLog:
44ce1d
    
44ce1d
            * c.opt (Wbidi-chars, Wbidi-chars=): New option.
44ce1d
    
44ce1d
    gcc/ChangeLog:
44ce1d
    
44ce1d
            * doc/invoke.texi: Document -Wbidi-chars.
44ce1d
    
44ce1d
    libcpp/ChangeLog:
44ce1d
    
44ce1d
            * include/cpplib.h (enum cpp_bidirectional_level): New.
44ce1d
            (struct cpp_options): Add cpp_warn_bidirectional.
44ce1d
            (enum cpp_warning_reason): Add CPP_W_BIDIRECTIONAL.
44ce1d
            * internal.h (struct cpp_reader): Add warn_bidi_p member
44ce1d
            function.
44ce1d
            * init.c (cpp_create_reader): Set cpp_warn_bidirectional.
44ce1d
            * lex.c (bidi): New namespace.
44ce1d
            (get_bidi_utf8): New function.
44ce1d
            (get_bidi_ucn): Likewise.
44ce1d
            (maybe_warn_bidi_on_close): Likewise.
44ce1d
            (maybe_warn_bidi_on_char): Likewise.
44ce1d
            (_cpp_skip_block_comment): Implement warning about bidirectional
44ce1d
            control characters.
44ce1d
            (skip_line_comment): Likewise.
44ce1d
            (forms_identifier_p): Likewise.
44ce1d
            (lex_identifier): Likewise.
44ce1d
            (lex_string): Likewise.
44ce1d
            (lex_raw_string): Likewise.
44ce1d
    
44ce1d
    gcc/testsuite/ChangeLog:
44ce1d
    
44ce1d
            * c-c++-common/Wbidi-chars-1.c: New test.
44ce1d
            * c-c++-common/Wbidi-chars-2.c: New test.
44ce1d
            * c-c++-common/Wbidi-chars-3.c: New test.
44ce1d
            * c-c++-common/Wbidi-chars-4.c: New test.
44ce1d
            * c-c++-common/Wbidi-chars-5.c: New test.
44ce1d
            * c-c++-common/Wbidi-chars-6.c: New test.
44ce1d
            * c-c++-common/Wbidi-chars-7.c: New test.
44ce1d
            * c-c++-common/Wbidi-chars-8.c: New test.
44ce1d
            * c-c++-common/Wbidi-chars-9.c: New test.
44ce1d
            * c-c++-common/Wbidi-chars-10.c: New test.
44ce1d
            * c-c++-common/Wbidi-chars-11.c: New test.
44ce1d
            * c-c++-common/Wbidi-chars-12.c: New test.
44ce1d
            * c-c++-common/Wbidi-chars-13.c: New test.
44ce1d
            * c-c++-common/Wbidi-chars-14.c: New test.
44ce1d
            * c-c++-common/Wbidi-chars-15.c: New test.
44ce1d
            * c-c++-common/Wbidi-chars-16.c: New test.
44ce1d
            * c-c++-common/Wbidi-chars-17.c: New test.
f9e3de
f9e3de
diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt
44ce1d
index 8a4cd634f77..3976fc368db 100644
f9e3de
--- a/gcc/c-family/c.opt
f9e3de
+++ b/gcc/c-family/c.opt
f9e3de
@@ -374,6 +374,30 @@ Wbad-function-cast
f9e3de
 C ObjC Var(warn_bad_function_cast) Warning
f9e3de
 Warn about casting functions to incompatible types.
f9e3de
 
44ce1d
+Wbidi-chars
44ce1d
+C ObjC C++ ObjC++ Warning Alias(Wbidi-chars=,any,none)
f9e3de
+;
f9e3de
+
44ce1d
+Wbidi-chars=
f9e3de
+C ObjC C++ ObjC++ RejectNegative Joined Warning CPP(cpp_warn_bidirectional) CppReason(CPP_W_BIDIRECTIONAL) Var(warn_bidirectional) Init(bidirectional_unpaired) Enum(cpp_bidirectional_level)
44ce1d
+-Wbidi-chars=[none|unpaired|any] Warn about UTF-8 bidirectional control characters.
f9e3de
+
f9e3de
+; Required for these enum values.
f9e3de
+SourceInclude
f9e3de
+cpplib.h
f9e3de
+
f9e3de
+Enum
44ce1d
+Name(cpp_bidirectional_level) Type(int) UnknownError(argument %qs to %<-Wbidi-chars%> not recognized)
f9e3de
+
f9e3de
+EnumValue
f9e3de
+Enum(cpp_bidirectional_level) String(none) Value(bidirectional_none)
f9e3de
+
f9e3de
+EnumValue
f9e3de
+Enum(cpp_bidirectional_level) String(unpaired) Value(bidirectional_unpaired)
f9e3de
+
f9e3de
+EnumValue
f9e3de
+Enum(cpp_bidirectional_level) String(any) Value(bidirectional_any)
f9e3de
+
f9e3de
 Wbool-compare
f9e3de
 C ObjC C++ ObjC++ Var(warn_bool_compare) Warning LangEnabledBy(C ObjC C++ ObjC++,Wall)
f9e3de
 Warn about boolean expression compared with an integer value different from true/false.
f9e3de
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
44ce1d
index 6070288856c..a22758d18ee 100644
f9e3de
--- a/gcc/doc/invoke.texi
f9e3de
+++ b/gcc/doc/invoke.texi
f9e3de
@@ -325,7 +325,9 @@ Objective-C and Objective-C++ Dialects}.
f9e3de
 -Warith-conversion @gol
f9e3de
 -Warray-bounds  -Warray-bounds=@var{n} @gol
f9e3de
 -Wno-attributes  -Wattribute-alias=@var{n} -Wno-attribute-alias @gol
f9e3de
--Wno-attribute-warning  -Wbool-compare  -Wbool-operation @gol
f9e3de
+-Wno-attribute-warning  @gol
44ce1d
+-Wbidi-chars=@r{[}none@r{|}unpaired@r{|}any@r{]} @gol
f9e3de
+-Wbool-compare  -Wbool-operation @gol
f9e3de
 -Wno-builtin-declaration-mismatch @gol
f9e3de
 -Wno-builtin-macro-redefined  -Wc90-c99-compat  -Wc99-c11-compat @gol
f9e3de
 -Wc11-c2x-compat @gol
44ce1d
@@ -7557,6 +7559,23 @@ Attributes considered include @code{alloc_align}, @code{alloc_size},
f9e3de
 This is the default.  You can disable these warnings with either
f9e3de
 @option{-Wno-attribute-alias} or @option{-Wattribute-alias=0}.
f9e3de
 
44ce1d
+@item -Wbidi-chars=@r{[}none@r{|}unpaired@r{|}any@r{]}
44ce1d
+@opindex Wbidi-chars=
44ce1d
+@opindex Wbidi-chars
44ce1d
+@opindex Wno-bidi-chars
44ce1d
+Warn about possibly misleading UTF-8 bidirectional control characters in
44ce1d
+comments, string literals, character constants, and identifiers.  Such
44ce1d
+characters can change left-to-right writing direction into right-to-left
44ce1d
+(and vice versa), which can cause confusion between the logical order and
44ce1d
+visual order.  This may be dangerous; for instance, it may seem that a piece
44ce1d
+of code is not commented out, whereas it in fact is.
f9e3de
+
f9e3de
+There are three levels of warning supported by GCC@.  The default is
44ce1d
+@option{-Wbidi-chars=unpaired}, which warns about improperly terminated
44ce1d
+bidi contexts.  @option{-Wbidi-chars=none} turns the warning off.
44ce1d
+@option{-Wbidi-chars=any} warns about any use of bidirectional control
44ce1d
+characters.
f9e3de
+
f9e3de
 @item -Wbool-compare
f9e3de
 @opindex Wno-bool-compare
f9e3de
 @opindex Wbool-compare
44ce1d
diff --git a/gcc/testsuite/c-c++-common/Wbidi-chars-1.c b/gcc/testsuite/c-c++-common/Wbidi-chars-1.c
f9e3de
new file mode 100644
44ce1d
index 00000000000..34f5ac19271
f9e3de
--- /dev/null
44ce1d
+++ b/gcc/testsuite/c-c++-common/Wbidi-chars-1.c
44ce1d
@@ -0,0 +1,12 @@
44ce1d
+/* PR preprocessor/103026 */
f9e3de
+/* { dg-do compile } */
f9e3de
+
f9e3de
+int main() {
f9e3de
+    int isAdmin = 0;
f9e3de
+    /*‮ } ⁦if (isAdmin)⁩ ⁦ begin admins only */
f9e3de
+/* { dg-warning "bidirectional" "" { target *-*-* } .-1 } */
f9e3de
+        __builtin_printf("You are an admin.\n");
f9e3de
+    /* end admins only ‮ { ⁦*/
f9e3de
+/* { dg-warning "bidirectional" "" { target *-*-* } .-1 } */
f9e3de
+    return 0;
f9e3de
+}
44ce1d
diff --git a/gcc/testsuite/c-c++-common/Wbidi-chars-10.c b/gcc/testsuite/c-c++-common/Wbidi-chars-10.c
f9e3de
new file mode 100644
44ce1d
index 00000000000..3f851b69e65
f9e3de
--- /dev/null
44ce1d
+++ b/gcc/testsuite/c-c++-common/Wbidi-chars-10.c
f9e3de
@@ -0,0 +1,27 @@
44ce1d
+/* PR preprocessor/103026 */
f9e3de
+/* { dg-do compile } */
44ce1d
+/* { dg-options "-Wbidi-chars=unpaired" } */
f9e3de
+/* More nesting testing.  */
f9e3de
+
f9e3de
+/* RLE‫ LRI⁦ PDF‬ PDI⁩*/
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int LRE_\u202a_PDF_\u202c;
f9e3de
+int LRE_\u202a_PDF_\u202c_LRE_\u202a_PDF_\u202c;
f9e3de
+int LRE_\u202a_LRI_\u2066_PDF_\u202c_PDI_\u2069;
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int RLE_\u202b_RLI_\u2067_PDF_\u202c_PDI_\u2069;
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int RLE_\u202b_RLI_\u2067_PDI_\u2069_PDF_\u202c;
f9e3de
+int FSI_\u2068_LRO_\u202d_PDI_\u2069_PDF_\u202c;
f9e3de
+int FSI_\u2068;
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int FSI_\u2068_PDI_\u2069;
f9e3de
+int FSI_\u2068_FSI_\u2068_PDI_\u2069;
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int RLI_\u2067_RLI_\u2067_RLI_\u2067_RLI_\u2067_RLI_\u2067_RLI_\u2067_RLI_\u2067_PDI_\u2069_PDI_\u2069_PDI_\u2069_PDI_\u2069_PDI_\u2069_PDI_\u2069_PDI_\u2069;
f9e3de
+int RLI_\u2067_RLI_\u2067_RLI_\u2067_RLI_\u2067_RLI_\u2067_RLI_\u2067_RLI_\u2067_PDI_\u2069_PDI_\u2069_PDI_\u2069_PDI_\u2069_PDI_\u2069_PDI_\u2069;
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int RLI_\u2067_RLI_\u2067_RLI_\u2067_RLI_\u2067_RLI_\u2067_RLI_\u2067_RLI_\u2067_PDI_\u2069_PDI_\u2069_PDI_\u2069_PDI_\u2069_PDI_\u2069_PDI_\u2069_PDF_\u202c;
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int RLI_\u2067_RLI_\u2067_RLI_\u2067_RLI_\u2067_FSI_\u2068_PDI_\u2069_PDI_\u2069_PDI_\u2069_PDI_\u2069;
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
44ce1d
diff --git a/gcc/testsuite/c-c++-common/Wbidi-chars-11.c b/gcc/testsuite/c-c++-common/Wbidi-chars-11.c
f9e3de
new file mode 100644
44ce1d
index 00000000000..270ce2368a9
f9e3de
--- /dev/null
44ce1d
+++ b/gcc/testsuite/c-c++-common/Wbidi-chars-11.c
44ce1d
@@ -0,0 +1,13 @@
44ce1d
+/* PR preprocessor/103026 */
f9e3de
+/* { dg-do compile } */
44ce1d
+/* { dg-options "-Wbidi-chars=unpaired" } */
f9e3de
+/* Test that we warn when mixing UCN and UTF-8.  */
f9e3de
+
f9e3de
+int LRE_‪_PDF_\u202c;
f9e3de
+/* { dg-warning "mismatch" "" { target *-*-* } .-1 } */
f9e3de
+int LRE_\u202a_PDF_‬_;
f9e3de
+/* { dg-warning "mismatch" "" { target *-*-* } .-1 } */
f9e3de
+const char *s1 = "LRE_‪_PDF_\u202c";
f9e3de
+/* { dg-warning "mismatch" "" { target *-*-* } .-1 } */
f9e3de
+const char *s2 = "LRE_\u202a_PDF_‬";
f9e3de
+/* { dg-warning "mismatch" "" { target *-*-* } .-1 } */
44ce1d
diff --git a/gcc/testsuite/c-c++-common/Wbidi-chars-12.c b/gcc/testsuite/c-c++-common/Wbidi-chars-12.c
f9e3de
new file mode 100644
44ce1d
index 00000000000..b07eec1da91
f9e3de
--- /dev/null
44ce1d
+++ b/gcc/testsuite/c-c++-common/Wbidi-chars-12.c
44ce1d
@@ -0,0 +1,19 @@
44ce1d
+/* PR preprocessor/103026 */
f9e3de
+/* { dg-do compile { target { c || c++11 } } } */
44ce1d
+/* { dg-options "-Wbidi-chars=any" } */
f9e3de
+/* Test raw strings.  */
f9e3de
+
f9e3de
+const char *s1 = R"(a b c LRE‪ 1 2 3 PDF‬ x y z)";
f9e3de
+/* { dg-warning "U\\+202A" "" { target *-*-* } .-1 } */
f9e3de
+const char *s2 = R"(a b c RLE‫ 1 2 3 PDF‬ x y z)";
f9e3de
+/* { dg-warning "U\\+202B" "" { target *-*-* } .-1 } */
f9e3de
+const char *s3 = R"(a b c LRO‭ 1 2 3 PDF‬ x y z)";
f9e3de
+/* { dg-warning "U\\+202D" "" { target *-*-* } .-1 } */
f9e3de
+const char *s4 = R"(a b c RLO‮ 1 2 3 PDF‬ x y z)";
f9e3de
+/* { dg-warning "U\\+202E" "" { target *-*-* } .-1 } */
f9e3de
+const char *s7 = R"(a b c FSI⁨ 1 2 3 PDI⁩ x y) z";
f9e3de
+/* { dg-warning "U\\+2068" "" { target *-*-* } .-1 } */
f9e3de
+const char *s8 = R"(a b c PDI⁩ x y )z";
f9e3de
+/* { dg-warning "U\\+2069" "" { target *-*-* } .-1 } */
f9e3de
+const char *s9 = R"(a b c PDF‬ x y z)";
f9e3de
+/* { dg-warning "U\\+202C" "" { target *-*-* } .-1 } */
44ce1d
diff --git a/gcc/testsuite/c-c++-common/Wbidi-chars-13.c b/gcc/testsuite/c-c++-common/Wbidi-chars-13.c
f9e3de
new file mode 100644
44ce1d
index 00000000000..b2dd9fde752
f9e3de
--- /dev/null
44ce1d
+++ b/gcc/testsuite/c-c++-common/Wbidi-chars-13.c
44ce1d
@@ -0,0 +1,17 @@
44ce1d
+/* PR preprocessor/103026 */
f9e3de
+/* { dg-do compile { target { c || c++11 } } } */
44ce1d
+/* { dg-options "-Wbidi-chars=unpaired" } */
f9e3de
+/* Test raw strings.  */
f9e3de
+
f9e3de
+const char *s1 = R"(a b c LRE‪ 1 2 3)";
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+const char *s2 = R"(a b c RLE‫ 1 2 3)";
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+const char *s3 = R"(a b c LRO‭ 1 2 3)";
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+const char *s4 = R"(a b c FSI⁨ 1 2 3)";
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+const char *s5 = R"(a b c LRI⁦ 1 2 3)";
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+const char *s6 = R"(a b c RLI⁧ 1 2 3)";
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
44ce1d
diff --git a/gcc/testsuite/c-c++-common/Wbidi-chars-14.c b/gcc/testsuite/c-c++-common/Wbidi-chars-14.c
44ce1d
new file mode 100644
44ce1d
index 00000000000..ba5f75d9553
44ce1d
--- /dev/null
44ce1d
+++ b/gcc/testsuite/c-c++-common/Wbidi-chars-14.c
44ce1d
@@ -0,0 +1,38 @@
44ce1d
+/* PR preprocessor/103026 */
44ce1d
+/* { dg-do compile } */
44ce1d
+/* { dg-options "-Wbidi-chars=unpaired" } */
44ce1d
+/* Test PDI handling, which also pops any subsequent LREs, RLEs, LROs,
44ce1d
+   or RLOs.  */
44ce1d
+
44ce1d
+/* LRI_⁦_LRI_⁦_RLE_‫_RLE_‫_RLE_‫_PDI_⁩*/
44ce1d
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
44ce1d
+// LRI_⁦_RLE_‫_RLE_‫_RLE_‫_PDI_⁩
44ce1d
+// LRI_⁦_RLO_‮_RLE_‫_RLE_‫_PDI_⁩
44ce1d
+// LRI_⁦_RLO_‮_RLE_‫_PDI_⁩
44ce1d
+// FSI_⁨_RLO_‮_PDI_⁩
44ce1d
+// FSI_⁨_FSI_⁨_RLO_‮_PDI_⁩
44ce1d
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
44ce1d
+
44ce1d
+int LRI_\u2066_LRI_\u2066_LRE_\u202a_LRE_\u202a_LRE_\u202a_PDI_\u2069;
44ce1d
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
44ce1d
+int LRI_\u2066_LRI_\u2066_LRE_\u202a_LRE_\u202a_LRE_\u202a_PDI_\u2069_PDI_\u2069;
44ce1d
+int LRI_\u2066_LRI_\u2066_LRI_\u2066_LRE_\u202a_LRE_\u202a_LRE_\u202a_PDI_\u2069_PDI_\u2069;
44ce1d
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
44ce1d
+int PDI_\u2069;
44ce1d
+int LRI_\u2066_PDI_\u2069;
44ce1d
+int RLI_\u2067_PDI_\u2069;
44ce1d
+int LRE_\u202a_LRI_\u2066_PDI_\u2069;
44ce1d
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
44ce1d
+int LRI_\u2066_LRE_\u202a_PDF_\u202c_PDI_\u2069;
44ce1d
+int LRI_\u2066_LRE_\u202a_LRE_\u202a_PDF_\u202c_PDI_\u2069;
44ce1d
+int RLI_\u2067_LRI_\u2066_LRE_\u202a_LRE_\u202a_PDF_\u202c_PDI_\u2069;
44ce1d
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
44ce1d
+int FSI_\u2068_LRI_\u2066_LRE_\u202a_LRE_\u202a_PDF_\u202c_PDI_\u2069;
44ce1d
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
44ce1d
+int RLO_\u202e_PDI_\u2069;
44ce1d
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
44ce1d
+int RLI_\u2067_PDI_\u2069_RLI_\u2067;
44ce1d
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
44ce1d
+int FSI_\u2068_PDF_\u202c_PDI_\u2069;
44ce1d
+int FSI_\u2068_FSI_\u2068_PDF_\u202c_PDI_\u2069;
44ce1d
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
44ce1d
diff --git a/gcc/testsuite/c-c++-common/Wbidi-chars-15.c b/gcc/testsuite/c-c++-common/Wbidi-chars-15.c
44ce1d
new file mode 100644
44ce1d
index 00000000000..a0ce8ff5e2c
44ce1d
--- /dev/null
44ce1d
+++ b/gcc/testsuite/c-c++-common/Wbidi-chars-15.c
44ce1d
@@ -0,0 +1,59 @@
44ce1d
+/* PR preprocessor/103026 */
44ce1d
+/* { dg-do compile } */
44ce1d
+/* { dg-options "-Wbidi-chars=unpaired" } */
44ce1d
+/* Test unpaired bidi control chars in multiline comments.  */
44ce1d
+
44ce1d
+/*
44ce1d
+ * LRE‪ end
44ce1d
+ */
44ce1d
+/* { dg-warning "unpaired" "" { target *-*-* } .-2 } */
44ce1d
+/*
44ce1d
+ * RLE‫ end
44ce1d
+ */
44ce1d
+/* { dg-warning "unpaired" "" { target *-*-* } .-2 } */
44ce1d
+/*
44ce1d
+ * LRO‭ end
44ce1d
+ */
44ce1d
+/* { dg-warning "unpaired" "" { target *-*-* } .-2 } */
44ce1d
+/*
44ce1d
+ * RLO‮ end
44ce1d
+ */
44ce1d
+/* { dg-warning "unpaired" "" { target *-*-* } .-2 } */
44ce1d
+/*
44ce1d
+ * LRI⁦ end
44ce1d
+ */
44ce1d
+/* { dg-warning "unpaired" "" { target *-*-* } .-2 } */
44ce1d
+/*
44ce1d
+ * RLI⁧ end
44ce1d
+ */
44ce1d
+/* { dg-warning "unpaired" "" { target *-*-* } .-2 } */
44ce1d
+/*
44ce1d
+ * FSI⁨ end
44ce1d
+ */
44ce1d
+/* { dg-warning "unpaired" "" { target *-*-* } .-2 } */
44ce1d
+/* LRE‪
44ce1d
+   PDF‬ */
44ce1d
+/* { dg-warning "unpaired" "" { target *-*-* } .-2 } */
44ce1d
+/* FSI⁨
44ce1d
+   PDI⁩ */
44ce1d
+/* { dg-warning "unpaired" "" { target *-*-* } .-2 } */
44ce1d
+
44ce1d
+/* LRE<‪>
44ce1d
+ *
44ce1d
+ */
44ce1d
+/* { dg-warning "unpaired" "" { target *-*-* } .-3 } */
44ce1d
+
44ce1d
+/*
44ce1d
+ * LRE<‪>
44ce1d
+ */
44ce1d
+/* { dg-warning "unpaired" "" { target *-*-* } .-2 } */
44ce1d
+
44ce1d
+/*
44ce1d
+ *
44ce1d
+ * LRE<‪> */
44ce1d
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
44ce1d
+
44ce1d
+/* RLI<⁧> */ /* PDI<⁩> */
44ce1d
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
44ce1d
+/* LRE<‪> */ /* PDF<‬> */
44ce1d
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
44ce1d
diff --git a/gcc/testsuite/c-c++-common/Wbidi-chars-16.c b/gcc/testsuite/c-c++-common/Wbidi-chars-16.c
44ce1d
new file mode 100644
44ce1d
index 00000000000..baa0159861c
44ce1d
--- /dev/null
44ce1d
+++ b/gcc/testsuite/c-c++-common/Wbidi-chars-16.c
44ce1d
@@ -0,0 +1,26 @@
44ce1d
+/* PR preprocessor/103026 */
44ce1d
+/* { dg-do compile } */
44ce1d
+/* { dg-options "-Wbidi-chars=any" } */
44ce1d
+/* Test LTR/RTL chars.  */
44ce1d
+
44ce1d
+/* LTR<‎> */
44ce1d
+/* { dg-warning "U\\+200E" "" { target *-*-* } .-1 } */
44ce1d
+// LTR<‎>
44ce1d
+/* { dg-warning "U\\+200E" "" { target *-*-* } .-1 } */
44ce1d
+/* RTL<‏> */
44ce1d
+/* { dg-warning "U\\+200F" "" { target *-*-* } .-1 } */
44ce1d
+// RTL<‏>
44ce1d
+/* { dg-warning "U\\+200F" "" { target *-*-* } .-1 } */
44ce1d
+
44ce1d
+const char *s1 = "LTR<‎>";
44ce1d
+/* { dg-warning "U\\+200E" "" { target *-*-* } .-1 } */
44ce1d
+const char *s2 = "LTR\u200e";
44ce1d
+/* { dg-warning "U\\+200E" "" { target *-*-* } .-1 } */
44ce1d
+const char *s3 = "LTR\u200E";
44ce1d
+/* { dg-warning "U\\+200E" "" { target *-*-* } .-1 } */
44ce1d
+const char *s4 = "RTL<‏>";
44ce1d
+/* { dg-warning "U\\+200F" "" { target *-*-* } .-1 } */
44ce1d
+const char *s5 = "RTL\u200f";
44ce1d
+/* { dg-warning "U\\+200F" "" { target *-*-* } .-1 } */
44ce1d
+const char *s6 = "RTL\u200F";
44ce1d
+/* { dg-warning "U\\+200F" "" { target *-*-* } .-1 } */
44ce1d
diff --git a/gcc/testsuite/c-c++-common/Wbidi-chars-17.c b/gcc/testsuite/c-c++-common/Wbidi-chars-17.c
f9e3de
new file mode 100644
44ce1d
index 00000000000..07cb4321f96
f9e3de
--- /dev/null
44ce1d
+++ b/gcc/testsuite/c-c++-common/Wbidi-chars-17.c
44ce1d
@@ -0,0 +1,30 @@
44ce1d
+/* PR preprocessor/103026 */
44ce1d
+/* { dg-do compile } */
44ce1d
+/* { dg-options "-Wbidi-chars=unpaired" } */
44ce1d
+/* Test LTR/RTL chars.  */
44ce1d
+
44ce1d
+/* LTR<‎> */
44ce1d
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
44ce1d
+// LTR<‎>
44ce1d
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
44ce1d
+/* RTL<‏> */
44ce1d
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
44ce1d
+// RTL<‏>
44ce1d
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
44ce1d
+int ltr_\u200e;
44ce1d
+/* { dg-error "universal character " "" { target *-*-* } .-1 } */
44ce1d
+int rtl_\u200f;
44ce1d
+/* { dg-error "universal character " "" { target *-*-* } .-1 } */
44ce1d
+
44ce1d
+const char *s1 = "LTR<‎>";
44ce1d
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
44ce1d
+const char *s2 = "LTR\u200e";
44ce1d
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
44ce1d
+const char *s3 = "LTR\u200E";
44ce1d
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
44ce1d
+const char *s4 = "RTL<‏>";
44ce1d
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
44ce1d
+const char *s5 = "RTL\u200f";
44ce1d
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
44ce1d
+const char *s6 = "RTL\u200F";
44ce1d
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
44ce1d
diff --git a/gcc/testsuite/c-c++-common/Wbidi-chars-2.c b/gcc/testsuite/c-c++-common/Wbidi-chars-2.c
44ce1d
new file mode 100644
44ce1d
index 00000000000..2340374f276
44ce1d
--- /dev/null
44ce1d
+++ b/gcc/testsuite/c-c++-common/Wbidi-chars-2.c
44ce1d
@@ -0,0 +1,9 @@
44ce1d
+/* PR preprocessor/103026 */
f9e3de
+/* { dg-do compile } */
f9e3de
+
f9e3de
+int main() {
f9e3de
+    /* Say hello; newline⁧/*/ return 0 ;
f9e3de
+/* { dg-warning "bidirectional" "" { target *-*-* } .-1 } */
f9e3de
+    __builtin_printf("Hello world.\n");
f9e3de
+    return 0;
f9e3de
+}
44ce1d
diff --git a/gcc/testsuite/c-c++-common/Wbidi-chars-3.c b/gcc/testsuite/c-c++-common/Wbidi-chars-3.c
f9e3de
new file mode 100644
44ce1d
index 00000000000..9dc7edb6e64
f9e3de
--- /dev/null
44ce1d
+++ b/gcc/testsuite/c-c++-common/Wbidi-chars-3.c
44ce1d
@@ -0,0 +1,11 @@
44ce1d
+/* PR preprocessor/103026 */
f9e3de
+/* { dg-do compile } */
f9e3de
+
f9e3de
+int main() {
f9e3de
+    const char* access_level = "user";
f9e3de
+    if (__builtin_strcmp(access_level, "user‮ ⁦// Check if admin⁩ ⁦")) {
f9e3de
+/* { dg-warning "bidirectional" "" { target *-*-* } .-1 } */
f9e3de
+        __builtin_printf("You are an admin.\n");
f9e3de
+    }
f9e3de
+    return 0;
f9e3de
+}
44ce1d
diff --git a/gcc/testsuite/c-c++-common/Wbidi-chars-4.c b/gcc/testsuite/c-c++-common/Wbidi-chars-4.c
f9e3de
new file mode 100644
44ce1d
index 00000000000..639e5c62e88
f9e3de
--- /dev/null
44ce1d
+++ b/gcc/testsuite/c-c++-common/Wbidi-chars-4.c
44ce1d
@@ -0,0 +1,188 @@
44ce1d
+/* PR preprocessor/103026 */
f9e3de
+/* { dg-do compile } */
44ce1d
+/* { dg-options "-Wbidi-chars=any -Wno-multichar -Wno-overflow" } */
f9e3de
+/* Test all bidi chars in various contexts (identifiers, comments,
f9e3de
+   string literals, character constants), both UCN and UTF-8.  The bidi
f9e3de
+   chars here are properly terminated, except for the character constants.  */
f9e3de
+
f9e3de
+/* a b c LRE‪ 1 2 3 PDF‬ x y z */
f9e3de
+/* { dg-warning "U\\+202A" "" { target *-*-* } .-1 } */
f9e3de
+/* a b c RLE‫ 1 2 3 PDF‬ x y z */
f9e3de
+/* { dg-warning "U\\+202B" "" { target *-*-* } .-1 } */
f9e3de
+/* a b c LRO‭ 1 2 3 PDF‬ x y z */
f9e3de
+/* { dg-warning "U\\+202D" "" { target *-*-* } .-1 } */
f9e3de
+/* a b c RLO‮ 1 2 3 PDF‬ x y z */
f9e3de
+/* { dg-warning "U\\+202E" "" { target *-*-* } .-1 } */
f9e3de
+/* a b c LRI⁦ 1 2 3 PDI⁩ x y z */
f9e3de
+/* { dg-warning "U\\+2066" "" { target *-*-* } .-1 } */
f9e3de
+/* a b c RLI⁧ 1 2 3 PDI⁩ x y */
f9e3de
+/* { dg-warning "U\\+2067" "" { target *-*-* } .-1 } */
f9e3de
+/* a b c FSI⁨ 1 2 3 PDI⁩ x y z */
f9e3de
+/* { dg-warning "U\\+2068" "" { target *-*-* } .-1 } */
f9e3de
+
f9e3de
+/* Same but C++ comments instead.  */
f9e3de
+// a b c LRE‪ 1 2 3 PDF‬ x y z
f9e3de
+/* { dg-warning "U\\+202A" "" { target *-*-* } .-1 } */
f9e3de
+// a b c RLE‫ 1 2 3 PDF‬ x y z
f9e3de
+/* { dg-warning "U\\+202B" "" { target *-*-* } .-1 } */
f9e3de
+// a b c LRO‭ 1 2 3 PDF‬ x y z
f9e3de
+/* { dg-warning "U\\+202D" "" { target *-*-* } .-1 } */
f9e3de
+// a b c RLO‮ 1 2 3 PDF‬ x y z
f9e3de
+/* { dg-warning "U\\+202E" "" { target *-*-* } .-1 } */
f9e3de
+// a b c LRI⁦ 1 2 3 PDI⁩ x y z
f9e3de
+/* { dg-warning "U\\+2066" "" { target *-*-* } .-1 } */
f9e3de
+// a b c RLI⁧ 1 2 3 PDI⁩ x y
f9e3de
+/* { dg-warning "U\\+2067" "" { target *-*-* } .-1 } */
f9e3de
+// a b c FSI⁨ 1 2 3 PDI⁩ x y z
f9e3de
+/* { dg-warning "U\\+2068" "" { target *-*-* } .-1 } */
f9e3de
+
f9e3de
+/* Here we're closing an unopened context, warn when =any.  */
f9e3de
+/* a b c PDI⁩ x y z */
f9e3de
+/* { dg-warning "U\\+2069" "" { target *-*-* } .-1 } */
f9e3de
+/* a b c PDF‬ x y z */
f9e3de
+/* { dg-warning "U\\+202C" "" { target *-*-* } .-1 } */
f9e3de
+// a b c PDI⁩ x y z
f9e3de
+/* { dg-warning "U\\+2069" "" { target *-*-* } .-1 } */
f9e3de
+// a b c PDF‬ x y z
f9e3de
+/* { dg-warning "U\\+202C" "" { target *-*-* } .-1 } */
f9e3de
+
44ce1d
+/* Multiline comments.  */
44ce1d
+/* a b c PDI⁩ x y z
44ce1d
+   */
44ce1d
+/* { dg-warning "U\\+2069" "" { target *-*-* } .-2 } */
44ce1d
+/* a b c PDF‬ x y z
44ce1d
+   */
44ce1d
+/* { dg-warning "U\\+202C" "" { target *-*-* } .-2 } */
44ce1d
+/* first
44ce1d
+   a b c PDI⁩ x y z
44ce1d
+   */
44ce1d
+/* { dg-warning "U\\+2069" "" { target *-*-* } .-2 } */
44ce1d
+/* first
44ce1d
+   a b c PDF‬ x y z
44ce1d
+   */
44ce1d
+/* { dg-warning "U\\+202C" "" { target *-*-* } .-2 } */
44ce1d
+/* first
44ce1d
+   a b c PDI⁩ x y z */
44ce1d
+/* { dg-warning "U\\+2069" "" { target *-*-* } .-1 } */
44ce1d
+/* first
44ce1d
+   a b c PDF‬ x y z */
44ce1d
+/* { dg-warning "U\\+202C" "" { target *-*-* } .-1 } */
44ce1d
+
f9e3de
+void
f9e3de
+g1 ()
f9e3de
+{
f9e3de
+  const char *s1 = "a b c LRE‪ 1 2 3 PDF‬ x y z";
f9e3de
+/* { dg-warning "U\\+202A" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s2 = "a b c RLE‫ 1 2 3 PDF‬ x y z";
f9e3de
+/* { dg-warning "U\\+202B" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s3 = "a b c LRO‭ 1 2 3 PDF‬ x y z";
f9e3de
+/* { dg-warning "U\\+202D" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s4 = "a b c RLO‮ 1 2 3 PDF‬ x y z";
f9e3de
+/* { dg-warning "U\\+202E" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s5 = "a b c LRI⁦ 1 2 3 PDI⁩ x y z";
f9e3de
+/* { dg-warning "U\\+2066" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s6 = "a b c RLI⁧ 1 2 3 PDI⁩ x y z";
f9e3de
+/* { dg-warning "U\\+2067" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s7 = "a b c FSI⁨ 1 2 3 PDI⁩ x y z";
f9e3de
+/* { dg-warning "U\\+2068" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s8 = "a b c PDI⁩ x y z";
f9e3de
+/* { dg-warning "U\\+2069" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s9 = "a b c PDF‬ x y z";
f9e3de
+/* { dg-warning "U\\+202C" "" { target *-*-* } .-1 } */
f9e3de
+
f9e3de
+  const char *s10 = "a b c LRE\u202a 1 2 3 PDF\u202c x y z";
f9e3de
+/* { dg-warning "U\\+202A" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s11 = "a b c LRE\u202A 1 2 3 PDF\u202c x y z";
f9e3de
+/* { dg-warning "U\\+202A" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s12 = "a b c RLE\u202b 1 2 3 PDF\u202c x y z";
f9e3de
+/* { dg-warning "U\\+202B" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s13 = "a b c RLE\u202B 1 2 3 PDF\u202c x y z";
f9e3de
+/* { dg-warning "U\\+202B" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s14 = "a b c LRO\u202d 1 2 3 PDF\u202c x y z";
f9e3de
+/* { dg-warning "U\\+202D" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s15 = "a b c LRO\u202D 1 2 3 PDF\u202c x y z";
f9e3de
+/* { dg-warning "U\\+202D" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s16 = "a b c RLO\u202e 1 2 3 PDF\u202c x y z";
f9e3de
+/* { dg-warning "U\\+202E" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s17 = "a b c RLO\u202E 1 2 3 PDF\u202c x y z";
f9e3de
+/* { dg-warning "U\\+202E" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s18 = "a b c LRI\u2066 1 2 3 PDI\u2069 x y z";
f9e3de
+/* { dg-warning "U\\+2066" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s19 = "a b c RLI\u2067 1 2 3 PDI\u2069 x y z";
f9e3de
+/* { dg-warning "U\\+2067" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s20 = "a b c FSI\u2068 1 2 3 PDI\u2069 x y z";
f9e3de
+/* { dg-warning "U\\+2068" "" { target *-*-* } .-1 } */
f9e3de
+}
f9e3de
+
f9e3de
+void
f9e3de
+g2 ()
f9e3de
+{
f9e3de
+  const char c1 = '\u202a';
f9e3de
+/* { dg-warning "U\\+202A" "" { target *-*-* } .-1 } */
f9e3de
+  const char c2 = '\u202A';
f9e3de
+/* { dg-warning "U\\+202A" "" { target *-*-* } .-1 } */
f9e3de
+  const char c3 = '\u202b';
f9e3de
+/* { dg-warning "U\\+202B" "" { target *-*-* } .-1 } */
f9e3de
+  const char c4 = '\u202B';
f9e3de
+/* { dg-warning "U\\+202B" "" { target *-*-* } .-1 } */
f9e3de
+  const char c5 = '\u202d';
f9e3de
+/* { dg-warning "U\\+202D" "" { target *-*-* } .-1 } */
f9e3de
+  const char c6 = '\u202D';
f9e3de
+/* { dg-warning "U\\+202D" "" { target *-*-* } .-1 } */
f9e3de
+  const char c7 = '\u202e';
f9e3de
+/* { dg-warning "U\\+202E" "" { target *-*-* } .-1 } */
f9e3de
+  const char c8 = '\u202E';
f9e3de
+/* { dg-warning "U\\+202E" "" { target *-*-* } .-1 } */
f9e3de
+  const char c9 = '\u2066';
f9e3de
+/* { dg-warning "U\\+2066" "" { target *-*-* } .-1 } */
f9e3de
+  const char c10 = '\u2067';
f9e3de
+/* { dg-warning "U\\+2067" "" { target *-*-* } .-1 } */
f9e3de
+  const char c11 = '\u2068';
f9e3de
+/* { dg-warning "U\\+2068" "" { target *-*-* } .-1 } */
f9e3de
+}
f9e3de
+
f9e3de
+int a‪b‬c;
f9e3de
+/* { dg-warning "U\\+202A" "" { target *-*-* } .-1 } */
f9e3de
+int a‫b‬c;
f9e3de
+/* { dg-warning "U\\+202B" "" { target *-*-* } .-1 } */
f9e3de
+int a‭b‬c;
f9e3de
+/* { dg-warning "U\\+202D" "" { target *-*-* } .-1 } */
f9e3de
+int a‮b‬c;
f9e3de
+/* { dg-warning "U\\+202E" "" { target *-*-* } .-1 } */
f9e3de
+int a⁦b⁩c;
f9e3de
+/* { dg-warning "U\\+2066" "" { target *-*-* } .-1 } */
f9e3de
+int a⁧b⁩c;
f9e3de
+/* { dg-warning "U\\+2067" "" { target *-*-* } .-1 } */
f9e3de
+int a⁨b⁩c;
f9e3de
+/* { dg-warning "U\\+2068" "" { target *-*-* } .-1 } */
f9e3de
+int A‬X;
f9e3de
+/* { dg-warning "U\\+202C" "" { target *-*-* } .-1 } */
f9e3de
+int A\u202cY;
f9e3de
+/* { dg-warning "U\\+202C" "" { target *-*-* } .-1 } */
f9e3de
+int A\u202CY2;
f9e3de
+/* { dg-warning "U\\+202C" "" { target *-*-* } .-1 } */
f9e3de
+
f9e3de
+int d\u202ae\u202cf;
f9e3de
+/* { dg-warning "U\\+202A" "" { target *-*-* } .-1 } */
f9e3de
+int d\u202Ae\u202cf2;
f9e3de
+/* { dg-warning "U\\+202A" "" { target *-*-* } .-1 } */
f9e3de
+int d\u202be\u202cf;
f9e3de
+/* { dg-warning "U\\+202B" "" { target *-*-* } .-1 } */
f9e3de
+int d\u202Be\u202cf2;
f9e3de
+/* { dg-warning "U\\+202B" "" { target *-*-* } .-1 } */
f9e3de
+int d\u202de\u202cf;
f9e3de
+/* { dg-warning "U\\+202D" "" { target *-*-* } .-1 } */
f9e3de
+int d\u202De\u202cf2;
f9e3de
+/* { dg-warning "U\\+202D" "" { target *-*-* } .-1 } */
f9e3de
+int d\u202ee\u202cf;
f9e3de
+/* { dg-warning "U\\+202E" "" { target *-*-* } .-1 } */
f9e3de
+int d\u202Ee\u202cf2;
f9e3de
+/* { dg-warning "U\\+202E" "" { target *-*-* } .-1 } */
f9e3de
+int d\u2066e\u2069f;
f9e3de
+/* { dg-warning "U\\+2066" "" { target *-*-* } .-1 } */
f9e3de
+int d\u2067e\u2069f;
f9e3de
+/* { dg-warning "U\\+2067" "" { target *-*-* } .-1 } */
f9e3de
+int d\u2068e\u2069f;
f9e3de
+/* { dg-warning "U\\+2068" "" { target *-*-* } .-1 } */
f9e3de
+int X\u2069;
f9e3de
+/* { dg-warning "U\\+2069" "" { target *-*-* } .-1 } */
44ce1d
diff --git a/gcc/testsuite/c-c++-common/Wbidi-chars-5.c b/gcc/testsuite/c-c++-common/Wbidi-chars-5.c
f9e3de
new file mode 100644
44ce1d
index 00000000000..68cb053144b
f9e3de
--- /dev/null
44ce1d
+++ b/gcc/testsuite/c-c++-common/Wbidi-chars-5.c
44ce1d
@@ -0,0 +1,188 @@
44ce1d
+/* PR preprocessor/103026 */
f9e3de
+/* { dg-do compile } */
44ce1d
+/* { dg-options "-Wbidi-chars=unpaired -Wno-multichar -Wno-overflow" } */
f9e3de
+/* Test all bidi chars in various contexts (identifiers, comments,
f9e3de
+   string literals, character constants), both UCN and UTF-8.  The bidi
f9e3de
+   chars here are properly terminated, except for the character constants.  */
f9e3de
+
f9e3de
+/* a b c LRE‪ 1 2 3 PDF‬ x y z */
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+/* a b c RLE‫ 1 2 3 PDF‬ x y z */
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+/* a b c LRO‭ 1 2 3 PDF‬ x y z */
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+/* a b c RLO‮ 1 2 3 PDF‬ x y z */
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+/* a b c LRI⁦ 1 2 3 PDI⁩ x y z */
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+/* a b c RLI⁧ 1 2 3 PDI⁩ x y */
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+/* a b c FSI⁨ 1 2 3 PDI⁩ x y z */
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+
f9e3de
+/* Same but C++ comments instead.  */
f9e3de
+// a b c LRE‪ 1 2 3 PDF‬ x y z
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+// a b c RLE‫ 1 2 3 PDF‬ x y z
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+// a b c LRO‭ 1 2 3 PDF‬ x y z
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+// a b c RLO‮ 1 2 3 PDF‬ x y z
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+// a b c LRI⁦ 1 2 3 PDI⁩ x y z
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+// a b c RLI⁧ 1 2 3 PDI⁩ x y
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+// a b c FSI⁨ 1 2 3 PDI⁩ x y z
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+
f9e3de
+/* Here we're closing an unopened context, warn when =any.  */
f9e3de
+/* a b c PDI⁩ x y z */
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+/* a b c PDF‬ x y z */
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+// a b c PDI⁩ x y z
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+// a b c PDF‬ x y z
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+
44ce1d
+/* Multiline comments.  */
44ce1d
+/* a b c PDI⁩ x y z
44ce1d
+   */
44ce1d
+/* { dg-bogus "unpaired" "" { target *-*-* } .-2 } */
44ce1d
+/* a b c PDF‬ x y z
44ce1d
+   */
44ce1d
+/* { dg-bogus "unpaired" "" { target *-*-* } .-2 } */
44ce1d
+/* first
44ce1d
+   a b c PDI⁩ x y z
44ce1d
+   */
44ce1d
+/* { dg-bogus "unpaired" "" { target *-*-* } .-2 } */
44ce1d
+/* first
44ce1d
+   a b c PDF‬ x y z
44ce1d
+   */
44ce1d
+/* { dg-bogus "unpaired" "" { target *-*-* } .-2 } */
44ce1d
+/* first
44ce1d
+   a b c PDI⁩ x y z */
44ce1d
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
44ce1d
+/* first
44ce1d
+   a b c PDF‬ x y z */
44ce1d
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
44ce1d
+
f9e3de
+void
f9e3de
+g1 ()
f9e3de
+{
f9e3de
+  const char *s1 = "a b c LRE‪ 1 2 3 PDF‬ x y z";
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s2 = "a b c RLE‫ 1 2 3 PDF‬ x y z";
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s3 = "a b c LRO‭ 1 2 3 PDF‬ x y z";
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s4 = "a b c RLO‮ 1 2 3 PDF‬ x y z";
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s5 = "a b c LRI⁦ 1 2 3 PDI⁩ x y z";
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s6 = "a b c RLI⁧ 1 2 3 PDI⁩ x y z";
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s7 = "a b c FSI⁨ 1 2 3 PDI⁩ x y z";
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s8 = "a b c PDI⁩ x y z";
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s9 = "a b c PDF‬ x y z";
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+
f9e3de
+  const char *s10 = "a b c LRE\u202a 1 2 3 PDF\u202c x y z";
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s11 = "a b c LRE\u202A 1 2 3 PDF\u202c x y z";
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s12 = "a b c RLE\u202b 1 2 3 PDF\u202c x y z";
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s13 = "a b c RLE\u202B 1 2 3 PDF\u202c x y z";
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s14 = "a b c LRO\u202d 1 2 3 PDF\u202c x y z";
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s15 = "a b c LRO\u202D 1 2 3 PDF\u202c x y z";
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s16 = "a b c RLO\u202e 1 2 3 PDF\u202c x y z";
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s17 = "a b c RLO\u202E 1 2 3 PDF\u202c x y z";
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s18 = "a b c LRI\u2066 1 2 3 PDI\u2069 x y z";
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s19 = "a b c RLI\u2067 1 2 3 PDI\u2069 x y z";
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s20 = "a b c FSI\u2068 1 2 3 PDI\u2069 x y z";
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+}
f9e3de
+
f9e3de
+void
f9e3de
+g2 ()
f9e3de
+{
f9e3de
+  const char c1 = '\u202a';
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char c2 = '\u202A';
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char c3 = '\u202b';
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char c4 = '\u202B';
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char c5 = '\u202d';
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char c6 = '\u202D';
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char c7 = '\u202e';
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char c8 = '\u202E';
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char c9 = '\u2066';
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char c10 = '\u2067';
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char c11 = '\u2068';
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+}
f9e3de
+
f9e3de
+int a‪b‬c;
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int a‫b‬c;
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int a‭b‬c;
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int a‮b‬c;
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int a⁦b⁩c;
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int a⁧b⁩c;
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int a⁨b⁩c;
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int A‬X;
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int A\u202cY;
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int A\u202CY2;
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+
f9e3de
+int d\u202ae\u202cf;
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int d\u202Ae\u202cf2;
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int d\u202be\u202cf;
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int d\u202Be\u202cf2;
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int d\u202de\u202cf;
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int d\u202De\u202cf2;
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int d\u202ee\u202cf;
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int d\u202Ee\u202cf2;
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int d\u2066e\u2069f;
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int d\u2067e\u2069f;
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int d\u2068e\u2069f;
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int X\u2069;
f9e3de
+/* { dg-bogus "unpaired" "" { target *-*-* } .-1 } */
44ce1d
diff --git a/gcc/testsuite/c-c++-common/Wbidi-chars-6.c b/gcc/testsuite/c-c++-common/Wbidi-chars-6.c
f9e3de
new file mode 100644
44ce1d
index 00000000000..0ce6fff2dee
f9e3de
--- /dev/null
44ce1d
+++ b/gcc/testsuite/c-c++-common/Wbidi-chars-6.c
44ce1d
@@ -0,0 +1,155 @@
44ce1d
+/* PR preprocessor/103026 */
f9e3de
+/* { dg-do compile } */
44ce1d
+/* { dg-options "-Wbidi-chars=unpaired" } */
f9e3de
+/* Test nesting of bidi chars in various contexts.  */
f9e3de
+
f9e3de
+/* Terminated by the wrong char:  */
f9e3de
+/* a b c LRE‪ 1 2 3 PDI⁩ x y z */
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+/* a b c RLE‫ 1 2 3 PDI⁩ x y  z*/
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+/* a b c LRO‭ 1 2 3 PDI⁩ x y z */
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+/* a b c RLO‮ 1 2 3 PDI⁩ x y z */
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+/* a b c LRI⁦ 1 2 3 PDF‬ x y z */
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+/* a b c RLI⁧ 1 2 3 PDF‬ x y z */
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+/* a b c FSI⁨ 1 2 3 PDF‬ x y  z*/
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+
f9e3de
+/* LRE‪ PDF‬ */
f9e3de
+/* LRE‪ LRE‪ PDF‬ PDF‬ */
f9e3de
+/* PDF‬ LRE‪ PDF‬ */
f9e3de
+/* LRE‪ PDF‬ LRE‪ PDF‬ */
f9e3de
+/* LRE‪ LRE‪ PDF‬ */
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+/* PDF‬ LRE‪ */
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+
f9e3de
+// a b c LRE‪ 1 2 3 PDI⁩ x y z
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+// a b c RLE‫ 1 2 3 PDI⁩ x y  z*/
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+// a b c LRO‭ 1 2 3 PDI⁩ x y z 
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+// a b c RLO‮ 1 2 3 PDI⁩ x y z 
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+// a b c LRI⁦ 1 2 3 PDF‬ x y z 
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+// a b c RLI⁧ 1 2 3 PDF‬ x y z 
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+// a b c FSI⁨ 1 2 3 PDF‬ x y  z
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+
f9e3de
+// LRE‪ PDF‬ 
f9e3de
+// LRE‪ LRE‪ PDF‬ PDF‬
f9e3de
+// PDF‬ LRE‪ PDF‬
f9e3de
+// LRE‪ PDF‬ LRE‪ PDF‬
f9e3de
+// LRE‪ LRE‪ PDF‬
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+// PDF‬ LRE‪
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+
f9e3de
+void
f9e3de
+g1 ()
f9e3de
+{
f9e3de
+  const char *s1 = "a b c LRE‪ 1 2 3 PDI⁩ x y z";
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s2 = "a b c LRE\u202a 1 2 3 PDI\u2069 x y z";
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s3 = "a b c RLE‫ 1 2 3 PDI⁩ x y ";
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s4 = "a b c RLE\u202b 1 2 3 PDI\u2069 x y z";
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s5 = "a b c LRO‭ 1 2 3 PDI⁩ x y z";
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s6 = "a b c LRO\u202d 1 2 3 PDI\u2069 x y z";
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s7 = "a b c RLO‮ 1 2 3 PDI⁩ x y z";
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s8 = "a b c RLO\u202e 1 2 3 PDI\u2069 x y z";
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s9 = "a b c LRI⁦ 1 2 3 PDF‬ x y z";
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s10 = "a b c LRI\u2066 1 2 3 PDF\u202c x y z";
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s11 = "a b c RLI⁧ 1 2 3 PDF‬ x y z\
f9e3de
+    ";
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-2 } */
f9e3de
+  const char *s12 = "a b c RLI\u2067 1 2 3 PDF\u202c x y z";
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s13 = "a b c FSI⁨ 1 2 3 PDF‬ x y z";
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s14 = "a b c FSI\u2068 1 2 3 PDF\u202c x y z";
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s15 = "PDF‬ LRE‪";
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s16 = "PDF\u202c LRE\u202a";
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s17 = "LRE‪ PDF‬";
f9e3de
+  const char *s18 = "LRE\u202a PDF\u202c";
f9e3de
+  const char *s19 = "LRE‪ LRE‪ PDF‬ PDF‬";
f9e3de
+  const char *s20 = "LRE\u202a LRE\u202a PDF\u202c PDF\u202c";
f9e3de
+  const char *s21 = "PDF‬ LRE‪ PDF‬";
f9e3de
+  const char *s22 = "PDF\u202c LRE\u202a PDF\u202c";
f9e3de
+  const char *s23 = "LRE‪ LRE‪ PDF‬";
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s24 = "LRE\u202a LRE\u202a PDF\u202c";
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s25 = "PDF‬ LRE‪";
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s26 = "PDF\u202c LRE\u202a";
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s27 = "PDF‬ LRE\u202a";
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+  const char *s28 = "PDF\u202c LRE‪";
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+}
f9e3de
+
f9e3de
+int aLRE‪bPDI⁩;
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int A\u202aB\u2069C;
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int aRLE‫bPDI⁩;
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int a\u202bB\u2069c;
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int aLRO‭bPDI⁩;
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int a\u202db\u2069c2;
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int aRLO‮bPDI⁩;
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int a\u202eb\u2069;
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int aLRI⁦bPDF‬;
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int a\u2066b\u202c;
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int aRLI⁧bPDF‬c
f9e3de
+;
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-2 } */
f9e3de
+int a\u2067b\u202c;
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int aFSI⁨bPDF‬;
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int a\u2068b\u202c;
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int aFSI⁨bPD\u202C;
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int aFSI\u2068bPDF‬_;
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int aLRE‪bPDF‬b; 
f9e3de
+int A\u202aB\u202c;
f9e3de
+int a_LRE‪_LRE‪_b_PDF‬_PDF‬;
f9e3de
+int A\u202aA\u202aB\u202cB\u202c;
f9e3de
+int aPDF‬bLREadPDF‬;
f9e3de
+int a_\u202C_\u202a_\u202c;
f9e3de
+int a_LRE‪_b_PDF‬_c_LRE‪_PDF‬;
f9e3de
+int a_\u202a_\u202c_\u202a_\u202c_;
f9e3de
+int a_LRE‪_b_PDF‬_c_LRE‪;
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int a_\u202a_\u202c_\u202a_;
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
44ce1d
diff --git a/gcc/testsuite/c-c++-common/Wbidi-chars-7.c b/gcc/testsuite/c-c++-common/Wbidi-chars-7.c
f9e3de
new file mode 100644
44ce1d
index 00000000000..d012d420ec0
f9e3de
--- /dev/null
44ce1d
+++ b/gcc/testsuite/c-c++-common/Wbidi-chars-7.c
44ce1d
@@ -0,0 +1,9 @@
44ce1d
+/* PR preprocessor/103026 */
f9e3de
+/* { dg-do compile } */
44ce1d
+/* { dg-options "-Wbidi-chars=any" } */
f9e3de
+/* Test we ignore UCNs in comments.  */
f9e3de
+
f9e3de
+// a b c \u202a 1 2 3
f9e3de
+// a b c \u202A 1 2 3
f9e3de
+/* a b c \u202a 1 2 3 */
f9e3de
+/* a b c \u202A 1 2 3 */
44ce1d
diff --git a/gcc/testsuite/c-c++-common/Wbidi-chars-8.c b/gcc/testsuite/c-c++-common/Wbidi-chars-8.c
f9e3de
new file mode 100644
44ce1d
index 00000000000..4f54c5092ec
f9e3de
--- /dev/null
44ce1d
+++ b/gcc/testsuite/c-c++-common/Wbidi-chars-8.c
44ce1d
@@ -0,0 +1,13 @@
44ce1d
+/* PR preprocessor/103026 */
f9e3de
+/* { dg-do compile } */
44ce1d
+/* { dg-options "-Wbidi-chars=any" } */
f9e3de
+/* Test \u vs \U.  */
f9e3de
+
f9e3de
+int a_\u202A;
f9e3de
+/* { dg-warning "U\\+202A" "" { target *-*-* } .-1 } */
f9e3de
+int a_\u202a_2;
f9e3de
+/* { dg-warning "U\\+202A" "" { target *-*-* } .-1 } */
f9e3de
+int a_\U0000202A_3;
f9e3de
+/* { dg-warning "U\\+202A" "" { target *-*-* } .-1 } */
f9e3de
+int a_\U0000202a_4;
f9e3de
+/* { dg-warning "U\\+202A" "" { target *-*-* } .-1 } */
44ce1d
diff --git a/gcc/testsuite/c-c++-common/Wbidi-chars-9.c b/gcc/testsuite/c-c++-common/Wbidi-chars-9.c
f9e3de
new file mode 100644
44ce1d
index 00000000000..e2af1b1ca97
f9e3de
--- /dev/null
44ce1d
+++ b/gcc/testsuite/c-c++-common/Wbidi-chars-9.c
44ce1d
@@ -0,0 +1,29 @@
44ce1d
+/* PR preprocessor/103026 */
f9e3de
+/* { dg-do compile } */
44ce1d
+/* { dg-options "-Wbidi-chars=unpaired" } */
f9e3de
+/* Test that we properly separate bidi contexts (comment/identifier/character
f9e3de
+   constant/string literal).  */
f9e3de
+
f9e3de
+/* LRE ->‪<- */ int pdf_\u202c_1;
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+/* RLE ->‫<- */ int pdf_\u202c_2;
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+/* LRO ->‭<- */ int pdf_\u202c_3;
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+/* RLO ->‮<- */ int pdf_\u202c_4;
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+/* LRI ->⁦<-*/ int pdi_\u2069_1;
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+/* RLI ->⁧<- */ int pdi_\u2069_12;
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+/* FSI ->⁨<- */ int pdi_\u2069_3;
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+
f9e3de
+const char *s1 = "LRE\u202a"; /* PDF ->‬<- */
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+/* LRE ->‪<- */ const char *s2 = "PDF\u202c";
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+const char *s3 = "LRE\u202a"; int pdf_\u202c_5;
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
+int lre_\u202a; const char *s4 = "PDF\u202c";
f9e3de
+/* { dg-warning "unpaired" "" { target *-*-* } .-1 } */
f9e3de
diff --git a/libcpp/include/cpplib.h b/libcpp/include/cpplib.h
44ce1d
index 176f8c5bbce..112b9c24751 100644
f9e3de
--- a/libcpp/include/cpplib.h
f9e3de
+++ b/libcpp/include/cpplib.h
44ce1d
@@ -319,6 +319,17 @@ enum cpp_main_search
f9e3de
   CMS_system,  /* Search the system INCLUDE path.  */
f9e3de
 };
f9e3de
 
44ce1d
+/* The possible bidirectional control characters checking levels, from least
f9e3de
+   restrictive to most.  */
f9e3de
+enum cpp_bidirectional_level {
f9e3de
+  /* No checking.  */
f9e3de
+  bidirectional_none,
44ce1d
+  /* Only detect unpaired uses of bidirectional control characters.  */
f9e3de
+  bidirectional_unpaired,
44ce1d
+  /* Detect any use of bidirectional control characters.  */
f9e3de
+  bidirectional_any
f9e3de
+};
f9e3de
+
f9e3de
 /* This structure is nested inside struct cpp_reader, and
f9e3de
    carries all the options visible to the command line.  */
f9e3de
 struct cpp_options
44ce1d
@@ -539,6 +550,10 @@ struct cpp_options
f9e3de
   /* True if warn about differences between C++98 and C++11.  */
f9e3de
   bool cpp_warn_cxx11_compat;
f9e3de
 
44ce1d
+  /* Nonzero if bidirectional control characters checking is on.  See enum
f9e3de
+     cpp_bidirectional_level.  */
f9e3de
+  unsigned char cpp_warn_bidirectional;
f9e3de
+
f9e3de
   /* Dependency generation.  */
f9e3de
   struct
f9e3de
   {
44ce1d
@@ -643,7 +658,8 @@ enum cpp_warning_reason {
f9e3de
   CPP_W_C90_C99_COMPAT,
f9e3de
   CPP_W_C11_C2X_COMPAT,
f9e3de
   CPP_W_CXX11_COMPAT,
f9e3de
-  CPP_W_EXPANSION_TO_DEFINED
f9e3de
+  CPP_W_EXPANSION_TO_DEFINED,
f9e3de
+  CPP_W_BIDIRECTIONAL
f9e3de
 };
f9e3de
 
f9e3de
 /* Callback for header lookup for HEADER, which is the name of a
f9e3de
diff --git a/libcpp/init.c b/libcpp/init.c
f9e3de
index 5a424e23553..f9a8f5f088f 100644
f9e3de
--- a/libcpp/init.c
f9e3de
+++ b/libcpp/init.c
f9e3de
@@ -223,6 +223,7 @@ cpp_create_reader (enum c_lang lang, cpp_hash_table *table,
f9e3de
       = ENABLE_CANONICAL_SYSTEM_HEADERS;
f9e3de
   CPP_OPTION (pfile, ext_numeric_literals) = 1;
f9e3de
   CPP_OPTION (pfile, warn_date_time) = 0;
f9e3de
+  CPP_OPTION (pfile, cpp_warn_bidirectional) = bidirectional_unpaired;
f9e3de
 
f9e3de
   /* Default CPP arithmetic to something sensible for the host for the
f9e3de
      benefit of dumb users like fix-header.  */
44ce1d
diff --git a/libcpp/internal.h b/libcpp/internal.h
44ce1d
index 8577cab6c83..0ce0246c5a2 100644
44ce1d
--- a/libcpp/internal.h
44ce1d
+++ b/libcpp/internal.h
44ce1d
@@ -597,6 +597,13 @@ struct cpp_reader
44ce1d
   /* Location identifying the main source file -- intended to be line
44ce1d
      zero of said file.  */
44ce1d
   location_t main_loc;
44ce1d
+
44ce1d
+  /* Returns true iff we should warn about UTF-8 bidirectional control
44ce1d
+     characters.  */
44ce1d
+  bool warn_bidi_p () const
44ce1d
+  {
44ce1d
+    return CPP_OPTION (this, cpp_warn_bidirectional) != bidirectional_none;
44ce1d
+  }
44ce1d
 };
44ce1d
 
44ce1d
 /* Character classes.  Based on the more primitive macros in safe-ctype.h.
f9e3de
diff --git a/libcpp/lex.c b/libcpp/lex.c
44ce1d
index fa2253d41c3..6a4fbce6030 100644
f9e3de
--- a/libcpp/lex.c
f9e3de
+++ b/libcpp/lex.c
44ce1d
@@ -1164,6 +1164,324 @@ _cpp_process_line_notes (cpp_reader *pfile, int in_comment)
f9e3de
     }
f9e3de
 }
f9e3de
 
f9e3de
+namespace bidi {
f9e3de
+  enum class kind {
44ce1d
+    NONE, LRE, RLE, LRO, RLO, LRI, RLI, FSI, PDF, PDI, LTR, RTL
f9e3de
+  };
f9e3de
+
f9e3de
+  /* All the UTF-8 encodings of bidi characters start with E2.  */
f9e3de
+  constexpr uchar utf8_start = 0xe2;
f9e3de
+
f9e3de
+  /* A vector holding currently open bidi contexts.  We use a char for
f9e3de
+     each context, its LSB is 1 if it represents a PDF context, 0 if it
f9e3de
+     represents a PDI context.  The next bit is 1 if this context was open
f9e3de
+     by a bidi character written as a UCN, and 0 when it was UTF-8.  */
f9e3de
+  semi_embedded_vec <unsigned char, 16> vec;
f9e3de
+
f9e3de
+  /* Close the whole comment/identifier/string literal/character constant
f9e3de
+     context.  */
f9e3de
+  void on_close ()
f9e3de
+  {
f9e3de
+    vec.truncate (0);
f9e3de
+  }
f9e3de
+
f9e3de
+  /* Pop the last element in the vector.  */
f9e3de
+  void pop ()
f9e3de
+  {
f9e3de
+    unsigned int len = vec.count ();
f9e3de
+    gcc_checking_assert (len > 0);
f9e3de
+    vec.truncate (len - 1);
f9e3de
+  }
f9e3de
+
44ce1d
+  /* Return the context of the Ith element.  */
44ce1d
+  kind ctx_at (unsigned int i)
44ce1d
+  {
44ce1d
+    return (vec[i] & 1) ? kind::PDF : kind::PDI;
44ce1d
+  }
44ce1d
+
f9e3de
+  /* Return which context is currently opened.  */
f9e3de
+  kind current_ctx ()
f9e3de
+  {
f9e3de
+    unsigned int len = vec.count ();
f9e3de
+    if (len == 0)
f9e3de
+      return kind::NONE;
44ce1d
+    return ctx_at (len - 1);
f9e3de
+  }
f9e3de
+
f9e3de
+  /* Return true if the current context comes from a UCN origin, that is,
f9e3de
+     the bidi char which started this bidi context was written as a UCN.  */
f9e3de
+  bool current_ctx_ucn_p ()
f9e3de
+  {
f9e3de
+    unsigned int len = vec.count ();
f9e3de
+    gcc_checking_assert (len > 0);
f9e3de
+    return (vec[len - 1] >> 1) & 1;
f9e3de
+  }
f9e3de
+
f9e3de
+  /* We've read a bidi char, update the current vector as necessary.  */
f9e3de
+  void on_char (kind k, bool ucn_p)
f9e3de
+  {
f9e3de
+    switch (k)
f9e3de
+      {
f9e3de
+      case kind::LRE:
f9e3de
+      case kind::RLE:
f9e3de
+      case kind::LRO:
f9e3de
+      case kind::RLO:
f9e3de
+	vec.push (ucn_p ? 3u : 1u);
f9e3de
+	break;
f9e3de
+      case kind::LRI:
f9e3de
+      case kind::RLI:
f9e3de
+      case kind::FSI:
f9e3de
+	vec.push (ucn_p ? 2u : 0u);
f9e3de
+	break;
44ce1d
+      /* PDF terminates the scope of the last LRE, RLE, LRO, or RLO
44ce1d
+	 whose scope has not yet been terminated.  */
f9e3de
+      case kind::PDF:
f9e3de
+	if (current_ctx () == kind::PDF)
f9e3de
+	  pop ();
f9e3de
+	break;
44ce1d
+      /* PDI terminates the scope of the last LRI, RLI, or FSI whose
44ce1d
+	 scope has not yet been terminated, as well as the scopes of
44ce1d
+	 any subsequent LREs, RLEs, LROs, or RLOs whose scopes have not
44ce1d
+	 yet been terminated.  */
f9e3de
+      case kind::PDI:
44ce1d
+	for (int i = vec.count () - 1; i >= 0; --i)
44ce1d
+	  if (ctx_at (i) == kind::PDI)
44ce1d
+	    {
44ce1d
+	      vec.truncate (i);
44ce1d
+	      break;
44ce1d
+	    }
44ce1d
+	break;
44ce1d
+      case kind::LTR:
44ce1d
+      case kind::RTL:
44ce1d
+	/* These aren't popped by a PDF/PDI.  */
f9e3de
+	break;
f9e3de
+      [[likely]] case kind::NONE:
f9e3de
+	break;
f9e3de
+      default:
f9e3de
+	abort ();
f9e3de
+      }
f9e3de
+  }
f9e3de
+
f9e3de
+  /* Return a descriptive string for K.  */
f9e3de
+  const char *to_str (kind k)
f9e3de
+  {
f9e3de
+    switch (k)
f9e3de
+      {
f9e3de
+      case kind::LRE:
f9e3de
+	return "U+202A (LEFT-TO-RIGHT EMBEDDING)";
f9e3de
+      case kind::RLE:
f9e3de
+	return "U+202B (RIGHT-TO-LEFT EMBEDDING)";
f9e3de
+      case kind::LRO:
f9e3de
+	return "U+202D (LEFT-TO-RIGHT OVERRIDE)";
f9e3de
+      case kind::RLO:
f9e3de
+	return "U+202E (RIGHT-TO-LEFT OVERRIDE)";
f9e3de
+      case kind::LRI:
f9e3de
+	return "U+2066 (LEFT-TO-RIGHT ISOLATE)";
f9e3de
+      case kind::RLI:
f9e3de
+	return "U+2067 (RIGHT-TO-LEFT ISOLATE)";
f9e3de
+      case kind::FSI:
f9e3de
+	return "U+2068 (FIRST STRONG ISOLATE)";
f9e3de
+      case kind::PDF:
f9e3de
+	return "U+202C (POP DIRECTIONAL FORMATTING)";
f9e3de
+      case kind::PDI:
f9e3de
+	return "U+2069 (POP DIRECTIONAL ISOLATE)";
44ce1d
+      case kind::LTR:
44ce1d
+	return "U+200E (LEFT-TO-RIGHT MARK)";
44ce1d
+      case kind::RTL:
44ce1d
+	return "U+200F (RIGHT-TO-LEFT MARK)";
f9e3de
+      default:
f9e3de
+	abort ();
f9e3de
+      }
f9e3de
+  }
f9e3de
+}
f9e3de
+
f9e3de
+/* Parse a sequence of 3 bytes starting with P and return its bidi code.  */
f9e3de
+
f9e3de
+static bidi::kind
f9e3de
+get_bidi_utf8 (const unsigned char *const p)
f9e3de
+{
f9e3de
+  gcc_checking_assert (p[0] == bidi::utf8_start);
f9e3de
+
f9e3de
+  if (p[1] == 0x80)
f9e3de
+    switch (p[2])
f9e3de
+      {
f9e3de
+      case 0xaa:
f9e3de
+	return bidi::kind::LRE;
f9e3de
+      case 0xab:
f9e3de
+	return bidi::kind::RLE;
f9e3de
+      case 0xac:
f9e3de
+	return bidi::kind::PDF;
f9e3de
+      case 0xad:
f9e3de
+	return bidi::kind::LRO;
f9e3de
+      case 0xae:
f9e3de
+	return bidi::kind::RLO;
44ce1d
+      case 0x8e:
44ce1d
+	return bidi::kind::LTR;
44ce1d
+      case 0x8f:
44ce1d
+	return bidi::kind::RTL;
f9e3de
+      default:
f9e3de
+	break;
f9e3de
+      }
f9e3de
+  else if (p[1] == 0x81)
f9e3de
+    switch (p[2])
f9e3de
+      {
f9e3de
+      case 0xa6:
f9e3de
+	return bidi::kind::LRI;
f9e3de
+      case 0xa7:
f9e3de
+	return bidi::kind::RLI;
f9e3de
+      case 0xa8:
f9e3de
+	return bidi::kind::FSI;
f9e3de
+      case 0xa9:
f9e3de
+	return bidi::kind::PDI;
f9e3de
+      default:
f9e3de
+	break;
f9e3de
+      }
f9e3de
+
f9e3de
+  return bidi::kind::NONE;
f9e3de
+}
f9e3de
+
f9e3de
+/* Parse a UCN where P points just past \u or \U and return its bidi code.  */
f9e3de
+
f9e3de
+static bidi::kind
f9e3de
+get_bidi_ucn (const unsigned char *p, bool is_U)
f9e3de
+{
f9e3de
+  /* 6.4.3 Universal Character Names
f9e3de
+      \u hex-quad
f9e3de
+      \U hex-quad hex-quad
f9e3de
+     where \unnnn means \U0000nnnn.  */
f9e3de
+
f9e3de
+  if (is_U)
f9e3de
+    {
f9e3de
+      if (p[0] != '0' || p[1] != '0' || p[2] != '0' || p[3] != '0')
f9e3de
+	return bidi::kind::NONE;
f9e3de
+      /* Skip 4B so we can treat \u and \U the same below.  */
f9e3de
+      p += 4;
f9e3de
+    }
f9e3de
+
f9e3de
+  /* All code points we are looking for start with 20xx.  */
f9e3de
+  if (p[0] != '2' || p[1] != '0')
f9e3de
+    return bidi::kind::NONE;
f9e3de
+  else if (p[2] == '2')
f9e3de
+    switch (p[3])
f9e3de
+      {
f9e3de
+      case 'a':
f9e3de
+      case 'A':
f9e3de
+	return bidi::kind::LRE;
f9e3de
+      case 'b':
f9e3de
+      case 'B':
f9e3de
+	return bidi::kind::RLE;
f9e3de
+      case 'c':
f9e3de
+      case 'C':
f9e3de
+	return bidi::kind::PDF;
f9e3de
+      case 'd':
f9e3de
+      case 'D':
f9e3de
+	return bidi::kind::LRO;
f9e3de
+      case 'e':
f9e3de
+      case 'E':
f9e3de
+	return bidi::kind::RLO;
f9e3de
+      default:
f9e3de
+	break;
f9e3de
+      }
f9e3de
+  else if (p[2] == '6')
f9e3de
+    switch (p[3])
f9e3de
+      {
f9e3de
+      case '6':
f9e3de
+	return bidi::kind::LRI;
f9e3de
+      case '7':
f9e3de
+	return bidi::kind::RLI;
f9e3de
+      case '8':
f9e3de
+	return bidi::kind::FSI;
f9e3de
+      case '9':
f9e3de
+	return bidi::kind::PDI;
f9e3de
+      default:
f9e3de
+	break;
f9e3de
+      }
44ce1d
+  else if (p[2] == '0')
44ce1d
+    switch (p[3])
44ce1d
+      {
44ce1d
+      case 'e':
44ce1d
+      case 'E':
44ce1d
+	return bidi::kind::LTR;
44ce1d
+      case 'f':
44ce1d
+      case 'F':
44ce1d
+	return bidi::kind::RTL;
44ce1d
+      default:
44ce1d
+	break;
44ce1d
+      }
f9e3de
+
f9e3de
+  return bidi::kind::NONE;
f9e3de
+}
f9e3de
+
f9e3de
+/* We're closing a bidi context, that is, we've encountered a newline,
f9e3de
+   are closing a C-style comment, or are at the end of a string literal,
f9e3de
+   character constant, or identifier.  Warn if this context was not
f9e3de
+   properly terminated by a PDI or PDF.  P points to the last character
f9e3de
+   in this context.  */
f9e3de
+
f9e3de
+static void
f9e3de
+maybe_warn_bidi_on_close (cpp_reader *pfile, const uchar *p)
f9e3de
+{
f9e3de
+  if (CPP_OPTION (pfile, cpp_warn_bidirectional) == bidirectional_unpaired
f9e3de
+      && bidi::vec.count () > 0)
f9e3de
+    {
f9e3de
+      const location_t loc
f9e3de
+	= linemap_position_for_column (pfile->line_table,
f9e3de
+				       CPP_BUF_COLUMN (pfile->buffer, p));
f9e3de
+      cpp_warning_with_line (pfile, CPP_W_BIDIRECTIONAL, loc, 0,
44ce1d
+			     "unpaired UTF-8 bidirectional control character "
f9e3de
+			     "detected");
f9e3de
+    }
f9e3de
+  /* We're done with this context.  */
f9e3de
+  bidi::on_close ();
f9e3de
+}
f9e3de
+
f9e3de
+/* We're at the beginning or in the middle of an identifier/comment/string
f9e3de
+   literal/character constant.  Warn if we've encountered a bidi character.
f9e3de
+   KIND says which bidi character it was; P points to it in the character
f9e3de
+   stream.  UCN_P is true iff this bidi character was written as a UCN.  */
f9e3de
+
f9e3de
+static void
f9e3de
+maybe_warn_bidi_on_char (cpp_reader *pfile, const uchar *p, bidi::kind kind,
f9e3de
+			 bool ucn_p)
f9e3de
+{
f9e3de
+  if (__builtin_expect (kind == bidi::kind::NONE, 1))
f9e3de
+    return;
f9e3de
+
f9e3de
+  const auto warn_bidi = CPP_OPTION (pfile, cpp_warn_bidirectional);
f9e3de
+
f9e3de
+  if (warn_bidi != bidirectional_none)
f9e3de
+    {
f9e3de
+      const location_t loc
f9e3de
+	= linemap_position_for_column (pfile->line_table,
f9e3de
+				       CPP_BUF_COLUMN (pfile->buffer, p));
f9e3de
+      /* It seems excessive to warn about a PDI/PDF that is closing
f9e3de
+	 an opened context because we've already warned about the
f9e3de
+	 opening character.  Except warn when we have a UCN x UTF-8
f9e3de
+	 mismatch.  */
f9e3de
+      if (kind == bidi::current_ctx ())
f9e3de
+	{
f9e3de
+	  if (warn_bidi == bidirectional_unpaired
f9e3de
+	      && bidi::current_ctx_ucn_p () != ucn_p)
f9e3de
+	    cpp_warning_with_line (pfile, CPP_W_BIDIRECTIONAL, loc, 0,
f9e3de
+				   "UTF-8 vs UCN mismatch when closing "
f9e3de
+				   "a context by \"%s\"", bidi::to_str (kind));
f9e3de
+	}
f9e3de
+      else if (warn_bidi == bidirectional_any)
f9e3de
+	{
f9e3de
+	  if (kind == bidi::kind::PDF || kind == bidi::kind::PDI)
f9e3de
+	    cpp_warning_with_line (pfile, CPP_W_BIDIRECTIONAL, loc, 0,
f9e3de
+				   "\"%s\" is closing an unopened context",
f9e3de
+				   bidi::to_str (kind));
f9e3de
+	  else
f9e3de
+	    cpp_warning_with_line (pfile, CPP_W_BIDIRECTIONAL, loc, 0,
f9e3de
+				   "found problematic Unicode character \"%s\"",
f9e3de
+				   bidi::to_str (kind));
f9e3de
+	}
f9e3de
+    }
f9e3de
+  /* We're done with this context.  */
f9e3de
+  bidi::on_char (kind, ucn_p);
f9e3de
+}
f9e3de
+
f9e3de
 /* Skip a C-style block comment.  We find the end of the comment by
f9e3de
    seeing if an asterisk is before every '/' we encounter.  Returns
f9e3de
    nonzero if comment terminated by EOF, zero otherwise.
44ce1d
@@ -1175,6 +1493,7 @@ _cpp_skip_block_comment (cpp_reader *pfile)
f9e3de
   cpp_buffer *buffer = pfile->buffer;
f9e3de
   const uchar *cur = buffer->cur;
f9e3de
   uchar c;
44ce1d
+  const bool warn_bidi_p = pfile->warn_bidi_p ();
44ce1d
 
f9e3de
   cur++;
f9e3de
   if (*cur == '/')
44ce1d
@@ -1189,7 +1508,11 @@ _cpp_skip_block_comment (cpp_reader *pfile)
f9e3de
       if (c == '/')
f9e3de
 	{
f9e3de
 	  if (cur[-2] == '*')
f9e3de
-	    break;
f9e3de
+	    {
f9e3de
+	      if (warn_bidi_p)
f9e3de
+		maybe_warn_bidi_on_close (pfile, cur);
f9e3de
+	      break;
f9e3de
+	    }
f9e3de
 
f9e3de
 	  /* Warn about potential nested comments, but not if the '/'
f9e3de
 	     comes immediately before the true comment delimiter.
44ce1d
@@ -1208,6 +1531,8 @@ _cpp_skip_block_comment (cpp_reader *pfile)
f9e3de
 	{
f9e3de
 	  unsigned int cols;
f9e3de
 	  buffer->cur = cur - 1;
f9e3de
+	  if (warn_bidi_p)
f9e3de
+	    maybe_warn_bidi_on_close (pfile, cur);
f9e3de
 	  _cpp_process_line_notes (pfile, true);
f9e3de
 	  if (buffer->next_line >= buffer->rlimit)
f9e3de
 	    return true;
44ce1d
@@ -1218,6 +1543,13 @@ _cpp_skip_block_comment (cpp_reader *pfile)
f9e3de
 
f9e3de
 	  cur = buffer->cur;
f9e3de
 	}
f9e3de
+      /* If this is a beginning of a UTF-8 encoding, it might be
44ce1d
+	 a bidirectional control character.  */
f9e3de
+      else if (__builtin_expect (c == bidi::utf8_start, 0) && warn_bidi_p)
f9e3de
+	{
f9e3de
+	  bidi::kind kind = get_bidi_utf8 (cur - 1);
f9e3de
+	  maybe_warn_bidi_on_char (pfile, cur, kind, /*ucn_p=*/false);
f9e3de
+	}
f9e3de
     }
f9e3de
 
f9e3de
   buffer->cur = cur;
44ce1d
@@ -1233,9 +1565,31 @@ skip_line_comment (cpp_reader *pfile)
f9e3de
 {
f9e3de
   cpp_buffer *buffer = pfile->buffer;
f9e3de
   location_t orig_line = pfile->line_table->highest_line;
44ce1d
+  const bool warn_bidi_p = pfile->warn_bidi_p ();
f9e3de
 
f9e3de
-  while (*buffer->cur != '\n')
f9e3de
-    buffer->cur++;
f9e3de
+  if (!warn_bidi_p)
f9e3de
+    while (*buffer->cur != '\n')
f9e3de
+      buffer->cur++;
f9e3de
+  else
f9e3de
+    {
f9e3de
+      while (*buffer->cur != '\n'
f9e3de
+	     && *buffer->cur != bidi::utf8_start)
f9e3de
+	buffer->cur++;
f9e3de
+      if (__builtin_expect (*buffer->cur == bidi::utf8_start, 0))
f9e3de
+	{
f9e3de
+	  while (*buffer->cur != '\n')
f9e3de
+	    {
f9e3de
+	      if (__builtin_expect (*buffer->cur == bidi::utf8_start, 0))
f9e3de
+		{
f9e3de
+		  bidi::kind kind = get_bidi_utf8 (buffer->cur);
f9e3de
+		  maybe_warn_bidi_on_char (pfile, buffer->cur, kind,
f9e3de
+					   /*ucn_p=*/false);
f9e3de
+		}
f9e3de
+	      buffer->cur++;
f9e3de
+	    }
f9e3de
+	  maybe_warn_bidi_on_close (pfile, buffer->cur);
f9e3de
+	}
f9e3de
+    }
f9e3de
 
f9e3de
   _cpp_process_line_notes (pfile, true);
f9e3de
   return orig_line != pfile->line_table->highest_line;
44ce1d
@@ -1346,11 +1700,13 @@ static const cppchar_t utf8_signifier = 0xC0;
f9e3de
 
f9e3de
 /* Returns TRUE if the sequence starting at buffer->cur is valid in
f9e3de
    an identifier.  FIRST is TRUE if this starts an identifier.  */
f9e3de
+
f9e3de
 static bool
f9e3de
 forms_identifier_p (cpp_reader *pfile, int first,
f9e3de
 		    struct normalize_state *state)
f9e3de
 {
f9e3de
   cpp_buffer *buffer = pfile->buffer;
44ce1d
+  const bool warn_bidi_p = pfile->warn_bidi_p ();
f9e3de
 
f9e3de
   if (*buffer->cur == '$')
f9e3de
     {
44ce1d
@@ -1373,6 +1729,13 @@ forms_identifier_p (cpp_reader *pfile, int first,
f9e3de
       cppchar_t s;
f9e3de
       if (*buffer->cur >= utf8_signifier)
f9e3de
 	{
f9e3de
+	  if (__builtin_expect (*buffer->cur == bidi::utf8_start, 0)
f9e3de
+	      && warn_bidi_p)
f9e3de
+	    {
f9e3de
+	      bidi::kind kind = get_bidi_utf8 (buffer->cur);
f9e3de
+	      maybe_warn_bidi_on_char (pfile, buffer->cur, kind,
f9e3de
+				       /*ucn_p=*/false);
f9e3de
+	    }
f9e3de
 	  if (_cpp_valid_utf8 (pfile, &buffer->cur, buffer->rlimit, 1 + !first,
f9e3de
 			       state, &s))
f9e3de
 	    return true;
44ce1d
@@ -1381,6 +1744,13 @@ forms_identifier_p (cpp_reader *pfile, int first,
f9e3de
 	       && (buffer->cur[1] == 'u' || buffer->cur[1] == 'U'))
f9e3de
 	{
f9e3de
 	  buffer->cur += 2;
f9e3de
+	  if (warn_bidi_p)
f9e3de
+	    {
f9e3de
+	      bidi::kind kind = get_bidi_ucn (buffer->cur,
f9e3de
+					      buffer->cur[-1] == 'U');
f9e3de
+	      maybe_warn_bidi_on_char (pfile, buffer->cur, kind,
f9e3de
+				       /*ucn_p=*/true);
f9e3de
+	    }
f9e3de
 	  if (_cpp_valid_ucn (pfile, &buffer->cur, buffer->rlimit, 1 + !first,
f9e3de
 			      state, &s, NULL, NULL))
f9e3de
 	    return true;
44ce1d
@@ -1489,6 +1859,7 @@ lex_identifier (cpp_reader *pfile, const uchar *base, bool starts_ucn,
f9e3de
   const uchar *cur;
f9e3de
   unsigned int len;
f9e3de
   unsigned int hash = HT_HASHSTEP (0, *base);
44ce1d
+  const bool warn_bidi_p = pfile->warn_bidi_p ();
f9e3de
 
f9e3de
   cur = pfile->buffer->cur;
f9e3de
   if (! starts_ucn)
44ce1d
@@ -1512,6 +1883,8 @@ lex_identifier (cpp_reader *pfile, const uchar *base, bool starts_ucn,
44ce1d
 	    pfile->buffer->cur++;
44ce1d
 	  }
44ce1d
       } while (forms_identifier_p (pfile, false, nst));
f9e3de
+      if (warn_bidi_p)
f9e3de
+	maybe_warn_bidi_on_close (pfile, pfile->buffer->cur);
f9e3de
       result = _cpp_interpret_identifier (pfile, base,
f9e3de
 					  pfile->buffer->cur - base);
f9e3de
       *spelling = cpp_lookup (pfile, base, pfile->buffer->cur - base);
44ce1d
@@ -1758,6 +2131,7 @@ static void
f9e3de
 lex_raw_string (cpp_reader *pfile, cpp_token *token, const uchar *base)
f9e3de
 {
f9e3de
   const uchar *pos = base;
44ce1d
+  const bool warn_bidi_p = pfile->warn_bidi_p ();
f9e3de
 
f9e3de
   /* 'tis a pity this information isn't passed down from the lexer's
f9e3de
      initial categorization of the token.  */
44ce1d
@@ -1994,8 +2368,15 @@ lex_raw_string (cpp_reader *pfile, cpp_token *token, const uchar *base)
f9e3de
 	  pos = base = pfile->buffer->cur;
f9e3de
 	  note = &pfile->buffer->notes[pfile->buffer->cur_note];
f9e3de
 	}
f9e3de
+      else if (__builtin_expect ((unsigned char) c == bidi::utf8_start, 0)
f9e3de
+	       && warn_bidi_p)
f9e3de
+	maybe_warn_bidi_on_char (pfile, pos - 1, get_bidi_utf8 (pos - 1),
f9e3de
+				 /*ucn_p=*/false);
f9e3de
     }
f9e3de
 
f9e3de
+  if (warn_bidi_p)
f9e3de
+    maybe_warn_bidi_on_close (pfile, pos);
f9e3de
+
f9e3de
   if (CPP_OPTION (pfile, user_literals))
f9e3de
     {
f9e3de
       /* If a string format macro, say from inttypes.h, is placed touching
44ce1d
@@ -2090,15 +2471,27 @@ lex_string (cpp_reader *pfile, cpp_token *token, const uchar *base)
f9e3de
   else
f9e3de
     terminator = '>', type = CPP_HEADER_NAME;
f9e3de
 
44ce1d
+  const bool warn_bidi_p = pfile->warn_bidi_p ();
f9e3de
   for (;;)
f9e3de
     {
f9e3de
       cppchar_t c = *cur++;
f9e3de
 
f9e3de
       /* In #include-style directives, terminators are not escapable.  */
f9e3de
       if (c == '\\' && !pfile->state.angled_headers && *cur != '\n')
f9e3de
-	cur++;
f9e3de
+	{
f9e3de
+	  if ((cur[0] == 'u' || cur[0] == 'U') && warn_bidi_p)
f9e3de
+	    {
f9e3de
+	      bidi::kind kind = get_bidi_ucn (cur + 1, cur[0] == 'U');
f9e3de
+	      maybe_warn_bidi_on_char (pfile, cur, kind, /*ucn_p=*/true);
f9e3de
+	    }
f9e3de
+	  cur++;
f9e3de
+	}
f9e3de
       else if (c == terminator)
f9e3de
-	break;
f9e3de
+	{
f9e3de
+	  if (warn_bidi_p)
f9e3de
+	    maybe_warn_bidi_on_close (pfile, cur - 1);
f9e3de
+	  break;
f9e3de
+	}
f9e3de
       else if (c == '\n')
f9e3de
 	{
f9e3de
 	  cur--;
44ce1d
@@ -2115,6 +2508,11 @@ lex_string (cpp_reader *pfile, cpp_token *token, const uchar *base)
f9e3de
 	}
f9e3de
       else if (c == '\0')
f9e3de
 	saw_NUL = true;
f9e3de
+      else if (__builtin_expect (c == bidi::utf8_start, 0) && warn_bidi_p)
f9e3de
+	{
f9e3de
+	  bidi::kind kind = get_bidi_utf8 (cur - 1);
f9e3de
+	  maybe_warn_bidi_on_char (pfile, cur - 1, kind, /*ucn_p=*/false);
f9e3de
+	}
f9e3de
     }
f9e3de
 
f9e3de
   if (saw_NUL && !pfile->state.skipping)