This is an archive of the discontinued LLVM Phabricator instance.

lib/Driver/Driver.cpp
1631 ↗	(On Diff #182128)	We really ought to reconsider `__VERSION__` as well, although I don't think anyone checks that. Today I get this for it: "4.2.1 Compatible Clang 9.0.0 (git@github.com:llvm/llvm-project.git bd6354105b055af6193fb2b7561fe6f5ae0eb0d8)"
test/Driver/immediate-options.c
10 ↗	(On Diff #182128)	Maybe check `{{[0-9]+\.[0-9.]+}}`, to insist that it's a sequence of numbers and dots.

This revision is now accepted and ready to land.Mar 25 2019, 10:08 AM

Improve the test (thanks rnk)

@rnk btw, do you think it should be added to the clang release notes?

lib/Driver/Driver.cpp
1631 ↗	(On Diff #182128)	I can have a look to that if you want

Remove the empty directories

This revision was automatically updated to reflect the committed changes.

In D56803#1441876, @sylvestre.ledru wrote:

@rnk btw, do you think it should be added to the clang release notes?

I think it is release-note worthy. If you change VERSION, you can mention that as well.

lib/Driver/Driver.cpp
1631 ↗	(On Diff #182128)	If you're feeling motivated, I think it's worth doing to try to get us into a more consistent state.

Revision Contents

Path

Size

cfe/

trunk/

lib/

Driver/

6 lines

test/

Driver/

2 lines

Show First 20 Lines • Show All 1,634 Lines • ▼ Show 20 Lines	bool Driver::HandleImmediateArgs(const Compilation &C) {
if (C.getArgs().hasArg(options::OPT_dumpmachine)) {		if (C.getArgs().hasArg(options::OPT_dumpmachine)) {
llvm::outs() << C.getDefaultToolChain().getTripleString() << '\n';		llvm::outs() << C.getDefaultToolChain().getTripleString() << '\n';
return false;		return false;
}		}

if (C.getArgs().hasArg(options::OPT_dumpversion)) {		if (C.getArgs().hasArg(options::OPT_dumpversion)) {
// Since -dumpversion is only implemented for pedantic GCC compatibility, we		// Since -dumpversion is only implemented for pedantic GCC compatibility, we
// return an answer which matches our definition of __VERSION__.		// return an answer which matches our definition of __VERSION__.
//		llvm::outs() << CLANG_VERSION_STRING << "\n";
// If we want to return a more correct answer some day, then we should
// introduce a non-pedantically GCC compatible mode to Clang in which we
// provide sensible definitions for -dumpversion, __VERSION__, etc.
llvm::outs() << "4.2.1\n";
return false;		return false;
}		}

if (C.getArgs().hasArg(options::OPT__print_diagnostic_categories)) {		if (C.getArgs().hasArg(options::OPT__print_diagnostic_categories)) {
PrintDiagnosticCategories(llvm::outs());		PrintDiagnosticCategories(llvm::outs());
return false;		return false;
}		}

▲ Show 20 Lines • Show All 3,133 Lines • Show Last 20 Lines

	// RUN: %clang --help \| FileCheck %s -check-prefix=HELP			// RUN: %clang --help \| FileCheck %s -check-prefix=HELP
	// HELP: isystem			// HELP: isystem
	// HELP-NOT: ast-dump			// HELP-NOT: ast-dump
	// HELP-NOT: driver-mode			// HELP-NOT: driver-mode

	// RUN: %clang --help-hidden \| FileCheck %s -check-prefix=HELP-HIDDEN			// RUN: %clang --help-hidden \| FileCheck %s -check-prefix=HELP-HIDDEN
	// HELP-HIDDEN: driver-mode			// HELP-HIDDEN: driver-mode

	// RUN: %clang -dumpversion \| FileCheck %s -check-prefix=DUMPVERSION			// RUN: %clang -dumpversion \| FileCheck %s -check-prefix=DUMPVERSION
	// DUMPVERSION: 4.2.1			// DUMPVERSION: {{[0-9]+\.[0-9.]+}}

	// RUN: %clang -print-search-dirs \| FileCheck %s -check-prefix=PRINT-SEARCH-DIRS			// RUN: %clang -print-search-dirs \| FileCheck %s -check-prefix=PRINT-SEARCH-DIRS
	// PRINT-SEARCH-DIRS: programs: ={{.*}}			// PRINT-SEARCH-DIRS: programs: ={{.*}}
	// PRINT-SEARCH-DIRS: libraries: ={{.*}}			// PRINT-SEARCH-DIRS: libraries: ={{.*}}

	// Test if the -print-resource-dir option is accepted without error.			// Test if the -print-resource-dir option is accepted without error.
	// Allow unspecified output because the value of CLANG_RESOURCE_DIR is unknown.			// Allow unspecified output because the value of CLANG_RESOURCE_DIR is unknown.
	// RUN: %clang -print-resource-dir \| FileCheck %s -check-prefix=PRINT-RESOURCE-DIR			// RUN: %clang -print-resource-dir \| FileCheck %s -check-prefix=PRINT-RESOURCE-DIR
	// PRINT-RESOURCE-DIR: {{.+}}			// PRINT-RESOURCE-DIR: {{.+}}