@@ -1415,14 +1415,10 @@ class TargetInfo : public TransferrableTargetInfo,
1415
1415
switch (SignReturnAddr) {
1416
1416
case LangOptions::SignReturnAddressScopeKind::None:
1417
1417
return " none" ;
1418
- case LangOptions::SignReturnAddressScopeKind::NonLeaf:
1419
1418
return " non-leaf" ;
1420
- case LangOptions::SignReturnAddressScopeKind::All:
1421
- return " all" ;
1422
1419
}
1423
1420
llvm_unreachable (" Unexpected SignReturnAddressScopeKind" );
1424
1421
}
1425
-
1426
1422
const char *getSignKeyStr () const {
1427
1423
switch (SignKey) {
1428
1424
case LangOptions::SignReturnAddressKeyKind::AKey:
@@ -1441,10 +1437,7 @@ class TargetInfo : public TransferrableTargetInfo,
1441
1437
? (LangOpts.isSignReturnAddressScopeAll ()
1442
1438
? LangOptions::SignReturnAddressScopeKind::All
1443
1439
: LangOptions::SignReturnAddressScopeKind::NonLeaf)
1444
- : LangOptions::SignReturnAddressScopeKind::None;
1445
1440
SignKey = LangOpts.isSignReturnAddressWithAKey ()
1446
- ? LangOptions::SignReturnAddressKeyKind::AKey
1447
- : LangOptions::SignReturnAddressKeyKind::BKey;
1448
1441
BranchTargetEnforcement = LangOpts.BranchTargetEnforcement ;
1449
1442
BranchProtectionPAuthLR = LangOpts.BranchProtectionPAuthLR ;
1450
1443
GuardedControlStack = LangOpts.GuardedControlStack ;
@@ -1468,19 +1461,11 @@ class TargetInfo : public TransferrableTargetInfo,
1468
1461
if (GuardedControlStack)
1469
1462
FuncAttrs.addAttribute (" guarded-control-stack" );
1470
1463
}
1471
- };
1472
1464
1473
1465
// / Determine if the Architecture in this TargetInfo supports branch
1474
1466
// / protection
1475
1467
virtual bool isBranchProtectionSupportedArch (StringRef Arch) const {
1476
1468
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 {
1484
1469
Err = " " ;
1485
1470
return false ;
1486
1471
}
0 commit comments