[Layering] Move AutoUpgrade.h into the IR library where its

implementation already lives.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@202961 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/AutoUpgrade.h b/include/llvm/AutoUpgrade.h
deleted file mode 100644 (file)
index c774782..0000000
--- a/include/llvm/AutoUpgrade.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//===-- llvm/AutoUpgrade.h - AutoUpgrade Helpers ----------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-//  These functions are implemented by lib/IR/AutoUpgrade.cpp.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_AUTOUPGRADE_H
-#define LLVM_AUTOUPGRADE_H
-
-namespace llvm {
-  class CallInst;
-  class Constant;
-  class Function;
-  class Instruction;
-  class Module;
-  class GlobalVariable;
-  class Type;
-  class Value;
-
-  /// This is a more granular function that simply checks an intrinsic function
-  /// for upgrading, and returns true if it requires upgrading. It may return
-  /// null in NewFn if the all calls to the original intrinsic function
-  /// should be transformed to non-function-call instructions.
-  bool UpgradeIntrinsicFunction(Function *F, Function *&NewFn);
-
-  /// This is the complement to the above, replacing a specific call to an
-  /// intrinsic function with a call to the specified new function.
-  void UpgradeIntrinsicCall(CallInst *CI, Function *NewFn);
-
-  /// This is an auto-upgrade hook for any old intrinsic function syntaxes
-  /// which need to have both the function updated as well as all calls updated
-  /// to the new function. This should only be run in a post-processing fashion
-  /// so that it can update all calls to the old function.
-  void UpgradeCallsToIntrinsic(Function* F);
-
-  /// This checks for global variables which should be upgraded. It returns true
-  /// if it requires upgrading.
-  bool UpgradeGlobalVariable(GlobalVariable *GV);
-
-  /// If the TBAA tag for the given instruction uses the scalar TBAA format,
-  /// we upgrade it to the struct-path aware TBAA format.
-  void UpgradeInstWithTBAATag(Instruction *I);
-
-  /// This is an auto-upgrade for bitcast between pointers with different
-  /// address spaces: the instruction is replaced by a pair ptrtoint+inttoptr.
-  Instruction *UpgradeBitCastInst(unsigned Opc, Value *V, Type *DestTy,
-                                  Instruction *&Temp);
-
-  /// This is an auto-upgrade for bitcast constant expression between pointers
-  /// with different address spaces: the instruction is replaced by a pair
-  /// ptrtoint+inttoptr.
-  Value *UpgradeBitCastExpr(unsigned Opc, Constant *C, Type *DestTy);
-
-  /// Check the debug info version number, if it is out-dated, drop the debug
-  /// info. Return true if module is modified.
-  bool UpgradeDebugInfo(Module &M);
-} // End llvm namespace
-
-#endif

diff --git a/include/llvm/IR/AutoUpgrade.h b/include/llvm/IR/AutoUpgrade.h
new file mode 100644 (file)
index 0000000..076ed4a
--- /dev/null
+++ b/include/llvm/IR/AutoUpgrade.h
@@ -0,0 +1,66 @@
+//===- AutoUpgrade.h - AutoUpgrade Helpers ----------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+//  These functions are implemented by lib/IR/AutoUpgrade.cpp.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_IR_AUTOUPGRADE_H
+#define LLVM_IR_AUTOUPGRADE_H
+
+namespace llvm {
+  class CallInst;
+  class Constant;
+  class Function;
+  class Instruction;
+  class Module;
+  class GlobalVariable;
+  class Type;
+  class Value;
+
+  /// This is a more granular function that simply checks an intrinsic function
+  /// for upgrading, and returns true if it requires upgrading. It may return
+  /// null in NewFn if the all calls to the original intrinsic function
+  /// should be transformed to non-function-call instructions.
+  bool UpgradeIntrinsicFunction(Function *F, Function *&NewFn);
+
+  /// This is the complement to the above, replacing a specific call to an
+  /// intrinsic function with a call to the specified new function.
+  void UpgradeIntrinsicCall(CallInst *CI, Function *NewFn);
+
+  /// This is an auto-upgrade hook for any old intrinsic function syntaxes
+  /// which need to have both the function updated as well as all calls updated
+  /// to the new function. This should only be run in a post-processing fashion
+  /// so that it can update all calls to the old function.
+  void UpgradeCallsToIntrinsic(Function* F);
+
+  /// This checks for global variables which should be upgraded. It returns true
+  /// if it requires upgrading.
+  bool UpgradeGlobalVariable(GlobalVariable *GV);
+
+  /// If the TBAA tag for the given instruction uses the scalar TBAA format,
+  /// we upgrade it to the struct-path aware TBAA format.
+  void UpgradeInstWithTBAATag(Instruction *I);
+
+  /// This is an auto-upgrade for bitcast between pointers with different
+  /// address spaces: the instruction is replaced by a pair ptrtoint+inttoptr.
+  Instruction *UpgradeBitCastInst(unsigned Opc, Value *V, Type *DestTy,
+                                  Instruction *&Temp);
+
+  /// This is an auto-upgrade for bitcast constant expression between pointers
+  /// with different address spaces: the instruction is replaced by a pair
+  /// ptrtoint+inttoptr.
+  Value *UpgradeBitCastExpr(unsigned Opc, Constant *C, Type *DestTy);
+
+  /// Check the debug info version number, if it is out-dated, drop the debug
+  /// info. Return true if module is modified.
+  bool UpgradeDebugInfo(Module &M);
+} // End llvm namespace
+
+#endif

diff --git a/lib/AsmParser/LLParser.cpp b/lib/AsmParser/LLParser.cpp
index b36f0e840cf090147061e0b57723ddc77e063649..a4bbcfcefd5478ac24ebdb8d692f59b08bce96cb 100644 (file)
--- a/lib/AsmParser/LLParser.cpp
+++ b/lib/AsmParser/LLParser.cpp
@@ -13,7 +13,7 @@
 
 #include "LLParser.h"
 #include "llvm/ADT/SmallPtrSet.h"
-#include "llvm/AutoUpgrade.h"
+#include "llvm/IR/AutoUpgrade.h"
 #include "llvm/IR/CallingConv.h"
 #include "llvm/IR/Constants.h"
 #include "llvm/IR/DerivedTypes.h"

diff --git a/lib/Bitcode/Reader/BitcodeReader.cpp b/lib/Bitcode/Reader/BitcodeReader.cpp
index 0992997d7801e427a35192a3c7e722b3f69c70aa..527fd253988625fbfd28d8ff10c79de3ced92c4a 100644 (file)
--- a/lib/Bitcode/Reader/BitcodeReader.cpp
+++ b/lib/Bitcode/Reader/BitcodeReader.cpp
@@ -11,8 +11,8 @@
 #include "BitcodeReader.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/SmallVector.h"
-#include "llvm/AutoUpgrade.h"
 #include "llvm/Bitcode/LLVMBitCodes.h"
+#include "llvm/IR/AutoUpgrade.h"
 #include "llvm/IR/Constants.h"
 #include "llvm/IR/DerivedTypes.h"
 #include "llvm/IR/InlineAsm.h"

diff --git a/lib/IR/AutoUpgrade.cpp b/lib/IR/AutoUpgrade.cpp
index 637c9b1b05f0466652504dab4ca124d0c0fea897..2a33b13b75583393b2a40ee33307f5174e9cc422 100644 (file)
--- a/lib/IR/AutoUpgrade.cpp
+++ b/lib/IR/AutoUpgrade.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/AutoUpgrade.h"
+#include "llvm/IR/AutoUpgrade.h"
 #include "llvm/DebugInfo.h"
 #include "llvm/IR/CFG.h"
 #include "llvm/IR/CallSite.h"