This is an archive of the discontinued LLVM Phabricator instance.

Fix unquoted spaces in args in clang --verbose output
ClosedPublic

Authored by bmoody on Apr 23 2019, 12:42 AM.

Reviewers

Commits

Summary

The behaviour of not quoting spaces appears to have been introduced by mistake in revision b212b34f19472469c1d20ada3161c3523268d5be

Thanks for fixing!

This revision is now accepted and ready to land.Apr 23 2019, 2:46 AM

I don't have commit access, so you are welcome to commit on my behalf. Thanks!

This revision was automatically updated to reflect the committed changes.

Path

Size

lib/

Driver/

2 lines

test/

Driver/

9 lines

Show First 20 Lines • Show All 93 Lines • ▼ Show 20 Lines	static bool skipArgs(const char *Flag, bool HaveCrashVFS, int &SkipNum,
if (FlagRef.startswith("-fmodules-cache-path="))		if (FlagRef.startswith("-fmodules-cache-path="))
return true;		return true;

SkipNum = 0;		SkipNum = 0;
return false;		return false;
}		}

void Command::printArg(raw_ostream &OS, StringRef Arg, bool Quote) {		void Command::printArg(raw_ostream &OS, StringRef Arg, bool Quote) {
const bool Escape = Arg.find_first_of("\"\\$") != StringRef::npos;		const bool Escape = Arg.find_first_of(" \"\\$") != StringRef::npos;

if (!Quote && !Escape) {		if (!Quote && !Escape) {
OS << Arg;		OS << Arg;
return;		return;
}		}

// Quote and escape. This isn't really complete, but good enough.		// Quote and escape. This isn't really complete, but good enough.
OS << '"';		OS << '"';
▲ Show 20 Lines • Show All 331 Lines • Show Last 20 Lines

				// RUN: %clang --verbose -DSPACE="a b" -c %s 2>&1 \| FileCheck -check-prefix=SPACE -strict-whitespace %s
				// RUN: %clang --verbose -DQUOTES=\"\" -c %s 2>&1 \| FileCheck -check-prefix=QUOTES -strict-whitespace %s
				// RUN: %clang --verbose -DBACKSLASH=\\ -c %s 2>&1 \| FileCheck -check-prefix=BACKSLASH -strict-whitespace %s
				// RUN: %clang --verbose -DDOLLAR=\$ -c %s 2>&1 \| FileCheck -check-prefix=DOLLAR -strict-whitespace %s

				// SPACE: -cc1 {{.*}} -D "SPACE=a b"
				// QUOTES: -cc1 {{.*}} -D "QUOTES=\"\""
				// BACKSLASH: -cc1 {{.*}} -D "BACKSLASH=\\"
				// DOLLAR: -cc1 {{.*}} -D "DOLLAR=\$"