commit 46762030114916f9eabb40f7c4024ac3ab9fd7ba
author Richard Smith <richard-llvm@metafoo.co.uk> Fri Jun 20 19:23:57 2014 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Fri Jun 20 19:23:57 2014 +0000
tree 625ea1e5ddeab2e51e56f16f77b885540331d5c3
parent 6baeb8805cd69638ae7c5882826c15a1394a3b79

[C++1z] Implement N3981: Disable trigraphs by default in C++1z mode.

llvm-svn: 211392

clang/lib/Frontend/CompilerInvocation.cpp

diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp
index beaa092..4647179 100644
--- a/clang/lib/Frontend/CompilerInvocation.cpp
+++ b/clang/lib/Frontend/CompilerInvocation.cpp
@@ -1167,7 +1167,8 @@
 
   // Mimicing gcc's behavior, trigraphs are only enabled if -trigraphs
   // is specified, or -std is set to a conforming mode.
-  Opts.Trigraphs = !Opts.GNUMode;
+  // Trigraphs are disabled by default in c++1z onwards.
+  Opts.Trigraphs = !Opts.GNUMode && !Opts.CPlusPlus1z;
 
   Opts.DollarIdents = !Opts.AsmPreprocessor;