Skip to content

Clang-cl support and various other improvements #520

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HC-pel wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Clang-cl support and various other improvements #520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ services/libicecc.la
suse/icecream.spec
doc/*.1
doc/*.7
doc/*.gz
doc/index.html
tests/results
tests/test-suite.log
Expand All @@ -50,3 +51,7 @@ tests/testargs.log
tests/testargs.trs
tests/test-setup.sh
tests/listing.txt
unittests/testargs
unittests/testargs.log
unittests/testargs.trs
unittests/test-suite.log
2 changes: 2 additions & 0 deletions client/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ AM_CPPFLAGS = \
-DPLIBDIR=\"$(pkglibexecdir)\" \
-I$(top_srcdir)/services \
-I$(top_srcdir)/
AM_CXXFLAGS = \
-std="c++11"

EXTRA_DIST = icecc-create-env

Expand Down
236 changes: 235 additions & 1 deletion client/arg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,8 @@ static bool is_argument_with_space(const char* argument)
"--include-with-prefix-after",
"-iwithprefixbefore",
"--include-with-prefix-before",
"-iwithsysroot"
"-iwithsysroot",
"-imsvc"
};

for( size_t i = 0; i < sizeof( arguments ) / sizeof( arguments[ 0 ] ); ++i ) {
Expand All @@ -230,6 +231,163 @@ static bool is_argument_with_space(const char* argument)
return false;
}

static bool isClangClArgument( const char* argument )
{
// List of arguments was taken from a "clang-cl /?" call

static const char* const arguments[] =
{
"/arch:",
"/bigobj", // not in the help output, but occurs
"/Brepro",
"/C",
"/c",
"/D",
"/d1PP",
"/d1reportAllClassLayout",
"/diagnostics:",
"/EH",
"/EP",
"/execution-charset:",
"/E",
"/fallback",
"/FA",
"/Fa",
"/Fd", // not in the help output, but occurs
"/Fe",
"/Fi",
"/Fo",
"/fp:",
"/Fp",
"/GA",
"/Gd",
"/GF-",
"/GR-",
"/Gregcall",
"/GR",
"/Gr",
"/GS",
"/Gs",
"/guard:",
"/Gv",
"/Gw",
"/GX",
"/Gy",
"/Gz",
"/J",
"/LD",
"/MD",
"/MT",
"/nologo", // not in the help output, but occurs
"/O",
"/P",
"/Qvec",
"/RTC1",
"/RTCc",
"/RTCs",
"/RTCu",
"/showIncludes",
"/source-charset:",
"/std:",
"/TC",
"/TP",
"/utf-8",
"/vd",
"/vm",
"/volatile:",
"/W",
"/w",
"/X",
"/Y",
"/Z7",
"/Zc:",
"/Zd",
"/Zi",
"/Zl",
"/Zp",
"/Zs",
"--analyze",
"-faddrsig",
"-fansi-escape-codes",
"-fblocks",
"-fcf-protection",
"-fcolor-diagnostics",
"-fcomplete-member-pointers",
"-fcoverage-mapping",
"-fdebug-macro",
"-fdelayed-template-parsing",
"-fdiagnostics-absolute-paths",
"-fdiagnostics-parseable-fixits",
"-flto",
"-fmerge-all-constants",
"-fms-compatibility",
"-fms-extensions",
"-fmsc-version=",
"-fno-addrsig",
"-fno-builtin",
"-fno-complete-member-pointers",
"-fno-coverage-mapping",
"-fno-debug-macro",
"-fno-delayed-template-parsing",
"-fno-sanitize-",
"-fno-standalone-debug",
"-fobjc-runtime=",
"-fprofile-instr-",
"-fsanitize",
"-fstandalone-debug",
"-fwhole-program-vtables",
"-gcodeview",
"-gline-tables-only",
"-miamcu",
"-nobuiltininc",
"-Qunused-arguments",
"-R",
"-std:", // not in the help output, but occurs
"--target=",
"-v",
"-W"
};

for ( size_t i = 0; i < sizeof( arguments ) / sizeof( arguments[ 0 ] ); ++i )
{
if ( str_startswith( arguments[ i ], argument) )
{
return true;
}
}

return false;
}

static bool isClangClArgumentWithSpace( const char* argument )
{
// List of arguments was taken from a "clang-cl /?" call

static const char* const arguments[] =
{
"/FI",
"/imsvc",
"/I",
"/link",
"/o",
"/Tc",
"/Tp",
"/U",
"-mllvm",
"-Xclang"
};

for ( size_t i = 0; i < sizeof( arguments ) / sizeof( arguments[ 0 ] ); ++i )
{
if ( str_startswith( arguments[ i ], argument) )
{
return true;
}
}

return false;
}

static bool analyze_assembler_arg(string &arg, list<string> *extrafiles)
{
const char *pos = arg.c_str();
Expand Down Expand Up @@ -369,9 +527,12 @@ bool analyse_argv(const char * const *argv, CompileJob &job, bool icerun, list<s
It implies -E, so only the preprocessor is run,
not the compiler. There would be no point trying
to distribute it even if we could. */
if ( !compiler_is_clang_cl( job ) )
{
always_local = true;
args.append(a, Arg_Local);
log_info() << "argument " << a << ", building locally" << endl;
}
} else if (str_equal("--param", a)) {
args.append(a, Arg_Remote);

Expand Down Expand Up @@ -672,6 +833,16 @@ bool analyse_argv(const char * const *argv, CompileJob &job, bool icerun, list<s
always_local = true;
args.append(a, Arg_Rest);
args.append(p, Arg_Rest);
}
else if ( str_equal( "-ivfsoverlay", p ) )
{
if ( argv[ i + 1 ] && argv[ i + 2 ] && str_equal( "-Xclang", argv[ i + 1 ] ) )
{
args.append( a, Arg_Local );
args.append( p, Arg_Local );
args.append( argv[ ++i ], Arg_Local );
args.append( argv[ ++i ], Arg_Local );
}
} else {
args.append(a, Arg_Rest);
args.append(p, Arg_Rest);
Expand Down Expand Up @@ -709,6 +880,12 @@ bool analyse_argv(const char * const *argv, CompileJob &job, bool icerun, list<s
if (argv[i + 1]) {
args.append(argv[++i], Arg_Rest);
}
} else if ( str_equal( "--", a ) && compiler_is_clang_cl( job ) ) {
if ( argv[ i + 1 ] )
{
job.setInputFile( argv[ ++i ] );
}

} else {
args.append(a, Arg_Rest);

Expand All @@ -720,6 +897,46 @@ bool analyse_argv(const char * const *argv, CompileJob &job, bool icerun, list<s
}
} else if (a[0] == '@') {
args.append(a, Arg_Local);
} else if ( compiler_is_clang_cl( job ) ){
if ( isClangClArgument( a ) )
{
if ( str_startswith( "/D", a ) )
{
args.append( a, Arg_Cpp );
}
else if ( str_startswith( "/Fo", a ) )
{
a += 3;
ofile = a;
}
else if ( str_startswith( "/MD", a ) )
{
args.append( a, Arg_Cpp );
args.append( a, Arg_Remote );
}
else if ( str_startswith( "/showIncludes", a ) )
{
args.append( a, Arg_Cpp );
}
else
{
args.append( a, Arg_Rest );
}
}
else if ( isClangClArgumentWithSpace( a ) )
{
args.append(a, Arg_Remote);

/* skip next word, being option argument */
if ( argv[ i + 1 ] )
{
args.append( argv[ ++i ], Arg_Remote );
}
}
else
{
args.append(a, Arg_Rest);
}
} else {
args.append(a, Arg_Rest);
}
Expand Down Expand Up @@ -764,6 +981,8 @@ bool analyse_argv(const char * const *argv, CompileJob &job, bool icerun, list<s
if (it->first == "-Xclang" || it->first == "-x" || is_argument_with_space(it->first.c_str())) {
++it;
++it;
} else if (compiler_is_clang_cl(job) && isClangClArgument(it->first.c_str())) {
++it;
} else if (it->second != Arg_Rest || it->first.at(0) == '-'
|| it->first.at(0) == '@') {
++it;
Expand All @@ -789,6 +1008,8 @@ bool analyse_argv(const char * const *argv, CompileJob &job, bool icerun, list<s
}
}

log_info() << "input file: " << ifile << "\n";

if (ifile.find('.') != string::npos) {
string::size_type dot_index = ifile.rfind('.');
string ext = ifile.substr(dot_index + 1);
Expand Down Expand Up @@ -912,11 +1133,24 @@ bool analyse_argv(const char * const *argv, CompileJob &job, bool icerun, list<s
trace() << "scanned result: local args=" << concat_args(job.localFlags())
<< ", remote args=" << concat_args(job.remoteFlags())
<< ", rest=" << concat_args(job.restFlags())
<< ", input file=" << job.inputFile()
<< ", local=" << always_local
<< ", compiler=" << job.compilerName()
<< ", lang=" << job.language()
<< endl;
#endif
if (logfile_trace)
{
trace() << "scanned result:\n"
<< " local args=" << concat_args(job.localFlags()) << "\n"
<< " remote args=" << concat_args(job.remoteFlags()) << "\n"
<< " rest=" << concat_args(job.restFlags()) << "\n"
<< " input file=" << job.inputFile() << "\n"
<< " local=" << always_local << "\n"
<< " compiler=" << job.compilerName() << "\n"
<< " lang=" << job.language()
<< endl;
}

return always_local;
}
4 changes: 3 additions & 1 deletion client/client.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,14 @@ extern bool analyse_argv(const char * const *argv, CompileJob &job, bool icerun,
std::list<std::string> *extrafiles);

/* In cpp.cpp. */
extern pid_t call_cpp(CompileJob &job, int fdwrite, int fdread = -1);
extern pid_t call_cpp(CompileJob &job, int fdWriteStdout, int fdReadStdout = -1,
int fdWriteStderr = -1, int fdReadStderr = -1);

/* In local.cpp. */
extern int build_local(CompileJob &job, MsgChannel *daemon, struct rusage *usage = 0);
extern std::string find_compiler(const CompileJob &job);
extern bool compiler_is_clang(const CompileJob &job);
extern bool compiler_is_clang_cl(const CompileJob &job);
extern bool compiler_only_rewrite_includes(const CompileJob &job);
extern std::string compiler_path_lookup(const std::string &compiler);
extern std::string clang_get_default_target(const CompileJob &job);
Expand Down
Loading