This is an archive of the discontinued LLVM Phabricator instance.

Differential D124312

[Driver] Call hasFlag instead of hasArg
ClosedPublic

Authored by ahatanak on Apr 22 2022, 4:59 PM.

Details

Reviewers
zero9178
Commits
rG3b578ae9088c: [Driver] Call hasFlag instead of hasArg
Summary

_HAS_STATIC_RTTI should be set to 0 only by -fno-rtti according to the summary of https://reviews.llvm.org/D103771.

rdar://92039243

Diff Detail

Event Timeline

ahatanak created this revision.Apr 22 2022, 4:59 PM
Herald added a project: Restricted Project. · View Herald TranscriptApr 22 2022, 4:59 PM
ahatanak requested review of this revision.Apr 22 2022, 4:59 PM
Herald added a subscriber: MaskRay. · View Herald TranscriptApr 22 2022, 4:59 PM
zero9178 accepted this revision.Apr 22 2022, 5:23 PM

Ouch! Two bugs, and the one in the testsuite covered up the former one. Thank you for noticing.

This revision is now accepted and ready to land.Apr 22 2022, 5:23 PM
Harbormaster completed remote builds in B160994: Diff 424668.Apr 22 2022, 5:34 PM
Closed by commit rG3b578ae9088c: [Driver] Call hasFlag instead of hasArg (authored by ahatanak). · Explain WhyApr 22 2022, 8:15 PM
This revision was automatically updated to reflect the committed changes.
ahatanak added a commit: rG3b578ae9088c: [Driver] Call hasFlag instead of hasArg.

Revision Contents

PathSize
clang/
lib/
Driver/
ToolChains/
4 lines
test/
Driver/
8 lines

Diff 424687

clang/lib/Driver/ToolChains/MSVC.cpp

Show First 20 Lines • Show All 957 Lines • ▼ Show 20 LinesMSVCToolChain::TranslateArgs(const llvm::opt::DerivedArgList &Args,
return DAL; return DAL;
} }
void MSVCToolChain::addClangTargetOptions( void MSVCToolChain::addClangTargetOptions(
const ArgList &DriverArgs, ArgStringList &CC1Args, const ArgList &DriverArgs, ArgStringList &CC1Args,
Action::OffloadKind DeviceOffloadKind) const { Action::OffloadKind DeviceOffloadKind) const {
// MSVC STL kindly allows removing all usages of typeid by defining // MSVC STL kindly allows removing all usages of typeid by defining
// _HAS_STATIC_RTTI to 0. Do so, when compiling with -fno-rtti // _HAS_STATIC_RTTI to 0. Do so, when compiling with -fno-rtti
if (DriverArgs.hasArg(options::OPT_fno_rtti, options::OPT_frtti, if (DriverArgs.hasFlag(options::OPT_fno_rtti, options::OPT_frtti,
/*Default=*/false)) /*Default=*/false))
CC1Args.push_back("-D_HAS_STATIC_RTTI=0"); CC1Args.push_back("-D_HAS_STATIC_RTTI=0");
} }

clang/test/Driver/msvc-static-rtti.cpp

// RUN: %clang -target x86_64-pc-windows-msvc -fno-rtti -### %s 2>&1 | FileCheck %s -check-prefix STATIC-RTTI-DEF // RUN: %clang -target x86_64-pc-windows-msvc -fno-rtti -### %s 2>&1 | FileCheck %s -check-prefix NO-RTTI
// RUN: %clang -target x86_64-pc-windows-msvc -frtti -### %s 2>&1 | FileCheck %s -check-prefix STATIC-RTTI-DEF-NOT // RUN: %clang -target x86_64-pc-windows-msvc -frtti -### %s 2>&1 | FileCheck %s -check-prefix RTTI
// STATIC-RTTI-DEF: -D_HAS_STATIC_RTTI=0 // RTTI-NOT: -D_HAS_STATIC_RTTI=0
// STATIC-RTTI-DEF-NOT: -D_HAS_STATIC_RTTI=0 // NO-RTTI: -D_HAS_STATIC_RTTI=0