Skip to content

Commit 735d24d

Browse files
Move TargetInfo changes over.
Dropping restrictions on the member functions.
1 parent 0e2a9e1 commit 735d24d

File tree

1 file changed

+0
-15
lines changed

1 file changed

+0
-15
lines changed

clang/include/clang/Basic/TargetInfo.h

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1415,14 +1415,10 @@ class TargetInfo : public TransferrableTargetInfo,
14151415
switch (SignReturnAddr) {
14161416
case LangOptions::SignReturnAddressScopeKind::None:
14171417
return "none";
1418-
case LangOptions::SignReturnAddressScopeKind::NonLeaf:
14191418
return "non-leaf";
1420-
case LangOptions::SignReturnAddressScopeKind::All:
1421-
return "all";
14221419
}
14231420
llvm_unreachable("Unexpected SignReturnAddressScopeKind");
14241421
}
1425-
14261422
const char *getSignKeyStr() const {
14271423
switch (SignKey) {
14281424
case LangOptions::SignReturnAddressKeyKind::AKey:
@@ -1441,10 +1437,7 @@ class TargetInfo : public TransferrableTargetInfo,
14411437
? (LangOpts.isSignReturnAddressScopeAll()
14421438
? LangOptions::SignReturnAddressScopeKind::All
14431439
: LangOptions::SignReturnAddressScopeKind::NonLeaf)
1444-
: LangOptions::SignReturnAddressScopeKind::None;
14451440
SignKey = LangOpts.isSignReturnAddressWithAKey()
1446-
? LangOptions::SignReturnAddressKeyKind::AKey
1447-
: LangOptions::SignReturnAddressKeyKind::BKey;
14481441
BranchTargetEnforcement = LangOpts.BranchTargetEnforcement;
14491442
BranchProtectionPAuthLR = LangOpts.BranchProtectionPAuthLR;
14501443
GuardedControlStack = LangOpts.GuardedControlStack;
@@ -1468,19 +1461,11 @@ class TargetInfo : public TransferrableTargetInfo,
14681461
if (GuardedControlStack)
14691462
FuncAttrs.addAttribute("guarded-control-stack");
14701463
}
1471-
};
14721464

14731465
/// Determine if the Architecture in this TargetInfo supports branch
14741466
/// protection
14751467
virtual bool isBranchProtectionSupportedArch(StringRef Arch) const {
14761468
return false;
1477-
}
1478-
1479-
/// Determine if this TargetInfo supports the given branch protection
1480-
/// specification
1481-
virtual bool validateBranchProtection(StringRef Spec, StringRef Arch,
1482-
BranchProtectionInfo &BPI,
1483-
StringRef &Err) const {
14841469
Err = "";
14851470
return false;
14861471
}

0 commit comments

Comments
 (0)