some cleanup after code changes to address comments

Author: Alexander Yermolovich

bolt/lib/Passes/IdenticalCodeFolding.cpp

@@ -13,7 +13,6 @@
 #include "bolt/Passes/IdenticalCodeFolding.h"
 #include "bolt/Core/HashUtilities.h"
 #include "bolt/Core/ParallelUtilities.h"
-#include "bolt/Rewrite/RewriteInstance.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/ThreadPool.h"
@@ -32,7 +31,6 @@ using namespace bolt;
 namespace opts {
 
 extern cl::OptionCategory BoltOptCategory;
-extern cl::opt<unsigned> Verbosity;
 
 static cl::opt<bool>
     ICFUseDFS("icf-dfs", cl::desc("use DFS ordering when using -icf option"),
@@ -531,12 +529,10 @@ Error IdenticalCodeFolding::runOnFunctions(BinaryContext &BC) {
       ThPool->wait();
 
     LLVM_DEBUG(SinglePass.stopTimer());
-  };
-  if (BC.getICFLevel() == BinaryContext::ICFLevel::Safe) {
-    if (Error Err = markFunctionsUnsafeToFold(BC)) {
+  };  
+  if (BC.getICFLevel() == BinaryContext::ICFLevel::Safe)
+    if (Error Err = markFunctionsUnsafeToFold(BC))
       return Err;
-    }
-  }
   hashFunctions();
   createCongruentBuckets();
 

bolt/lib/Rewrite/BoltDiff.cpp

@@ -28,8 +28,6 @@ using namespace bolt;
 namespace opts {
 extern cl::OptionCategory BoltDiffCategory;
 extern cl::opt<bool> NeverPrint;
-extern cl::opt<bool> ICF;
-extern cl::opt<bool> SafeICF;
 
 static cl::opt<bool> IgnoreLTOSuffix(
     "ignore-lto-suffix",

bolt/test/X86/icf-safe-test2GlobalConstPtrNoPic.test

@@ -139,8 +139,7 @@ main:
 	movabsq	$barMulFunc, %rsi
 	callq	_Z7helper2PFKiiiES1_ii
 	retq
-.Lfunc_end6:
-	.size	main, .Lfunc_end6-main
+	.size	main, .-main
 	.cfi_endproc
 
 	.type	FooVar,@object