From 47f0b411712cd64eacabed27424fa1c2a57a9ccd Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Tue, 14 Feb 2017 23:41:38 +0000 Subject: [PATCH] Stop asserting when a meaningless -std= flag is passed for a non-compilation input kind; go back to silently ignoring the flag. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@295122 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Frontend/CompilerInvocation.cpp | 4 ++-- test/Driver/unknown-std.S | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 test/Driver/unknown-std.S diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp index 3001a2dda4..2ef96398c0 100644 --- a/lib/Frontend/CompilerInvocation.cpp +++ b/lib/Frontend/CompilerInvocation.cpp @@ -1702,8 +1702,8 @@ static bool IsInputCompatibleWithStandard(InputKind IK, return true; break; default: - llvm_unreachable("Cannot decide whether language standard and " - "input file kind are compatible!"); + // For other inputs, accept (and ignore) all -std= values. + return true; } return false; } diff --git a/test/Driver/unknown-std.S b/test/Driver/unknown-std.S new file mode 100644 index 0000000000..ecb6a9e92f --- /dev/null +++ b/test/Driver/unknown-std.S @@ -0,0 +1,2 @@ +// RUN: %clang -std=c++11 %s -E -o /dev/null 2>&1 | FileCheck %s --allow-empty +// CHECK-NOT: error -- 2.40.0