This is an archive of the discontinued LLVM Phabricator instance.

Differential D122344

[clang][driver] Disable non-functional --version option for clang -cc1
ClosedPublic

Authored by ekieri on Mar 23 2022, 12:43 PM.

Details

Reviewers
bruno
v.g.vassilev
thakis
dexonsmith
sscalpone
Commits
rG35b89bc24ca5: [clang][driver] Disable non-functional --version option for clang -cc1
Summary

This patch removes --version as a clang -cc1 option.

clang --version

and

clang --cc1 -version

remain valid. This behaviour is consistent with clang -cc1as.

Previously, clang -cc1 accepted both --version and -version, but
only -version was acted upon. The call

clang -cc1 --version

stalled without any message: --version was an accepted option but
triggered no action, and the driver waited for standard input.

Diff Detail

Event Timeline

ekieri created this revision.Mar 23 2022, 12:43 PM
Herald added a reviewer: sscalpone. · View Herald TranscriptMar 23 2022, 12:43 PM
Herald added a project: Restricted Project. · View Herald Transcript
ekieri requested review of this revision.Mar 23 2022, 12:43 PM
Herald added a project: Restricted Project. · View Herald TranscriptMar 23 2022, 12:43 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B155933: Diff 417719.Mar 23 2022, 1:09 PM
thakis accepted this revision.Mar 25 2022, 6:06 AM

thanks!

This revision is now accepted and ready to land.Mar 25 2022, 6:06 AM
Closed by commit rG35b89bc24ca5: [clang][driver] Disable non-functional --version option for clang -cc1 (authored by ekieri). · Explain WhyMar 25 2022, 11:05 AM
This revision was automatically updated to reflect the committed changes.
ekieri added a commit: rG35b89bc24ca5: [clang][driver] Disable non-functional --version option for clang -cc1.

Revision Contents

PathSize
clang/
include/
clang/
Driver/
2 lines
test/
Frontend/
3 lines

Diff 418276

clang/include/clang/Driver/Options.td

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 4,197 Lines • ▼ Show 20 Lines
def _profile : Flag<["--"], "profile">, Alias<p>; def _profile : Flag<["--"], "profile">, Alias<p>;
def _resource_EQ : Joined<["--"], "resource=">, Alias<fcompile_resource_EQ>; def _resource_EQ : Joined<["--"], "resource=">, Alias<fcompile_resource_EQ>;
def _resource : Separate<["--"], "resource">, Alias<fcompile_resource_EQ>; def _resource : Separate<["--"], "resource">, Alias<fcompile_resource_EQ>;
def _rtlib : Separate<["--"], "rtlib">, Alias<rtlib_EQ>; def _rtlib : Separate<["--"], "rtlib">, Alias<rtlib_EQ>;
def _serialize_diags : Separate<["-", "--"], "serialize-diagnostics">, Flags<[NoXarchOption]>, def _serialize_diags : Separate<["-", "--"], "serialize-diagnostics">, Flags<[NoXarchOption]>,
HelpText<"Serialize compiler diagnostics to a file">; HelpText<"Serialize compiler diagnostics to a file">;
// We give --version different semantics from -version. // We give --version different semantics from -version.
def _version : Flag<["--"], "version">, def _version : Flag<["--"], "version">,
Flags<[CoreOption, CC1Option, FC1Option, FlangOption]>, Flags<[CoreOption, FC1Option, FlangOption]>,
HelpText<"Print version information">; HelpText<"Print version information">;
def _signed_char : Flag<["--"], "signed-char">, Alias<fsigned_char>; def _signed_char : Flag<["--"], "signed-char">, Alias<fsigned_char>;
def _std : Separate<["--"], "std">, Alias<std_EQ>; def _std : Separate<["--"], "std">, Alias<std_EQ>;
def _stdlib : Separate<["--"], "stdlib">, Alias<stdlib_EQ>; def _stdlib : Separate<["--"], "stdlib">, Alias<stdlib_EQ>;
def _sysroot_EQ : Joined<["--"], "sysroot=">; def _sysroot_EQ : Joined<["--"], "sysroot=">;
def _sysroot : Separate<["--"], "sysroot">, Alias<_sysroot_EQ>; def _sysroot : Separate<["--"], "sysroot">, Alias<_sysroot_EQ>;
def _target_help : Flag<["--"], "target-help">; def _target_help : Flag<["--"], "target-help">;
def _trace_includes : Flag<["--"], "trace-includes">, Alias<H>; def _trace_includes : Flag<["--"], "trace-includes">, Alias<H>;
▲ Show 20 Lines • Show All 2,409 Lines • Show Last 20 Lines

clang/test/Frontend/unknown-arg.c

// RUN: not %clang_cc1 %s -E --helium 2>&1 | \ // RUN: not %clang_cc1 %s -E --helium 2>&1 | \
// RUN: FileCheck %s // RUN: FileCheck %s
// RUN: not %clang_cc1 %s -E --hel[ 2>&1 | \ // RUN: not %clang_cc1 %s -E --hel[ 2>&1 | \
// RUN: FileCheck %s --check-prefix=DID-YOU-MEAN // RUN: FileCheck %s --check-prefix=DID-YOU-MEAN
// RUN: not %clang %s -E -Xclang --hel[ 2>&1 | \ // RUN: not %clang %s -E -Xclang --hel[ 2>&1 | \
// RUN: FileCheck %s --check-prefix=DID-YOU-MEAN // RUN: FileCheck %s --check-prefix=DID-YOU-MEAN
// RUN: not %clang_cc1 --version 2>&1 | \
// RUN: FileCheck %s --check-prefix=DID-YOU-MEAN-VER
// CHECK: error: unknown argument: '--helium' // CHECK: error: unknown argument: '--helium'
// DID-YOU-MEAN: error: unknown argument '--hel['; did you mean '--help'? // DID-YOU-MEAN: error: unknown argument '--hel['; did you mean '--help'?
// DID-YOU-MEAN-VER: error: unknown argument '--version'; did you mean '-version'?