From b9765d2fa0d69db226621f8a281e69df527226f3 Mon Sep 17 00:00:00 2001
From: Eric Christopher <echristo@gmail.com>
Date: Sun, 19 Apr 2015 03:20:59 +0000
Subject: [PATCH] Remove the CFIEnforcing flag from TargetOptions as it is
 unused.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@235267 91177308-0d34-0410-b5e6-96231b3b80d8
---
 include/llvm/CodeGen/CommandFlags.h | 7 -------
 include/llvm/Target/TargetOptions.h | 7 +------
 lib/CodeGen/TargetOptionsImpl.cpp   | 3 +--
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/include/llvm/CodeGen/CommandFlags.h b/include/llvm/CodeGen/CommandFlags.h
index ef3e88b5ca2..ccd1bb3bb0b 100644
--- a/include/llvm/CodeGen/CommandFlags.h
+++ b/include/llvm/CodeGen/CommandFlags.h
@@ -231,11 +231,6 @@ FCFI("fcfi",
      cl::desc("Apply forward-edge control-flow integrity"),
      cl::init(false));
 
-cl::opt<bool>
-CFIEnforcing("cfi-enforcing",
-             cl::desc("Enforce CFI or pass the violation to a function."),
-             cl::init(false));
-
 // Note that this option is linked to the cfi-enforcing option above: if
 // cfi-enforcing is set, then the cfi-func-name option is entirely ignored. If
 // cfi-enforcing is false and no cfi-func-name is set, then a default function
@@ -280,8 +275,6 @@ static inline TargetOptions InitTargetOptionsFromCodeGenFlags() {
   Options.MCOptions = InitMCTargetOptionsFromFlags();
   Options.JTType = JTableType;
   Options.FCFI = FCFI;
-  Options.CFIEnforcing = CFIEnforcing;
-  Options.CFIFuncName = CFIFuncName;
 
   Options.ThreadModel = TMModel;
 
diff --git a/include/llvm/Target/TargetOptions.h b/include/llvm/Target/TargetOptions.h
index 5c63588767e..b41fcdb149e 100644
--- a/include/llvm/Target/TargetOptions.h
+++ b/include/llvm/Target/TargetOptions.h
@@ -74,7 +74,7 @@ namespace llvm {
           TrapFuncName(), FloatABIType(FloatABI::Default),
           AllowFPOpFusion(FPOpFusion::Standard), JTType(JumpTable::Single),
           FCFI(false), ThreadModel(ThreadModel::POSIX),
-          CFIEnforcing(false), CFIFuncName() {}
+          CFIFuncName() {}
 
     /// PrintMachineCode - This flag is enabled when the -print-machineinstrs
     /// option is specified on the command line, and should enable debugging
@@ -230,10 +230,6 @@ namespace llvm {
     /// for things like atomics
     ThreadModel::Model ThreadModel;
 
-    /// CFIEnforcing - This flags controls whether or not CFI violations cause
-    /// the program to halt.
-    bool CFIEnforcing;
-
     /// getCFIFuncName - If this returns a non-empty string, then this is the
     /// name of the function that will be called for each CFI violation in
     /// non-enforcing mode.
@@ -270,7 +266,6 @@ inline bool operator==(const TargetOptions &LHS,
     ARE_EQUAL(JTType) &&
     ARE_EQUAL(FCFI) &&
     ARE_EQUAL(ThreadModel) &&
-    ARE_EQUAL(CFIEnforcing) &&
     ARE_EQUAL(CFIFuncName) &&
     ARE_EQUAL(MCOptions);
 #undef ARE_EQUAL
diff --git a/lib/CodeGen/TargetOptionsImpl.cpp b/lib/CodeGen/TargetOptionsImpl.cpp
index 618d903a090..41c66bb8dc2 100644
--- a/lib/CodeGen/TargetOptionsImpl.cpp
+++ b/lib/CodeGen/TargetOptionsImpl.cpp
@@ -53,8 +53,7 @@ StringRef TargetOptions::getTrapFunctionName() const {
 }
 
 /// getCFIFuncName - If this returns a non-empty string, then it is the name of
-/// the function that gets called on CFI violations in CFI non-enforcing mode
-/// (!TargetOptions::CFIEnforcing).
+/// the function that gets called on CFI violations in CFI non-enforcing mode.
 StringRef TargetOptions::getCFIFuncName() const {
   return CFIFuncName;
 }
-- 
2.34.1