Skip to content

Commit bade8f3

Browse files
committed
Revert addition of a new declaration requirement
1 parent b1b2de3 commit bade8f3

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

clang/include/clang/Basic/Features.def

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,10 @@ FEATURE(type_sanitizer, LangOpts.Sanitize.has(SanitizerKind::Type))
147147
FEATURE(thread_sanitizer, LangOpts.Sanitize.has(SanitizerKind::Thread))
148148
FEATURE(dataflow_sanitizer, LangOpts.Sanitize.has(SanitizerKind::DataFlow))
149149
FEATURE(scudo, LangOpts.Sanitize.hasOneOf(SanitizerKind::Scudo))
150-
FEATURE(ptrauth_intrinsics, LangOpts.PointerAuthIntrinsics && Target.getTriple().isOSDarwin())
151-
FEATURE(ptrauth_qualifier, LangOpts.PointerAuthIntrinsics && Target.getTriple().isOSDarwin())
150+
FEATURE(ptrauth_intrinsics, LangOpts.PointerAuthIntrinsics &&
151+
PP.getTargetInfo().getTriple().isOSDarwin())
152+
FEATURE(ptrauth_qualifier, LangOpts.PointerAuthIntrinsics &&
153+
PP.getTargetInfo().getTriple().isOSDarwin())
152154
FEATURE(ptrauth_calls, LangOpts.PointerAuthCalls)
153155
FEATURE(ptrauth_returns, LangOpts.PointerAuthReturns)
154156
FEATURE(ptrauth_vtable_pointer_address_discrimination, LangOpts.PointerAuthVTPtrAddressDiscrimination)

clang/lib/Frontend/FrontendActions.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1159,7 +1159,7 @@ void DumpCompilerOptionsAction::ExecuteAction() {
11591159
raw_ostream &OS = *OSP;
11601160
const Preprocessor &PP = CI.getPreprocessor();
11611161
const LangOptions &LangOpts = PP.getLangOpts();
1162-
const TargetInfo &Target = CI.getTarget();
1162+
11631163

11641164
// FIXME: Rather than manually format the JSON (which is awkward due to
11651165
// needing to remove trailing commas), this should make use of a JSON library.

clang/lib/Lex/PPMacroExpansion.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1089,7 +1089,6 @@ static void ComputeDATE_TIME(SourceLocation &DATELoc, SourceLocation &TIMELoc,
10891089
/// specified by the identifier as a standard language feature.
10901090
static bool HasFeature(const Preprocessor &PP, StringRef Feature) {
10911091
const LangOptions &LangOpts = PP.getLangOpts();
1092-
const TargetInfo &Target = PP.getTargetInfo();
10931092

10941093
// Normalize the feature name, __foo__ becomes foo.
10951094
if (Feature.starts_with("__") && Feature.ends_with("__") &&

0 commit comments

Comments
 (0)