1 files changed, 15 insertions, 14 deletions
diff --git a/gnu/llvm/unittests/ExecutionEngine/Orc/ObjectTransformLayerTest.cpp b/gnu/llvm/unittests/ExecutionEngine/Orc/ObjectTransformLayerTest.cpp
index e1b1f2f9278..63b85dc82ca 100644
--- a/gnu/llvm/unittests/ExecutionEngine/Orc/ObjectTransformLayerTest.cpp
+++ b/gnu/llvm/unittests/ExecutionEngine/Orc/ObjectTransformLayerTest.cpp
@@ -95,31 +95,32 @@ public:
     resetExpectations();
   }
 
-  JITSymbol findSymbol(const std::string &Name, bool ExportedSymbolsOnly) {
+  llvm::JITSymbol findSymbol(const std::string &Name,
+                             bool ExportedSymbolsOnly) {
     EXPECT_EQ(MockName, Name) << "Name should pass through";
     EXPECT_EQ(MockBool, ExportedSymbolsOnly) << "Flag should pass through";
     LastCalled = "findSymbol";
-    MockSymbol = JITSymbol(122, llvm::JITSymbolFlags::None);
+    MockSymbol = llvm::JITSymbol(122, llvm::JITSymbolFlags::None);
     return MockSymbol;
   }
   void expectFindSymbol(const std::string &Name, bool ExportedSymbolsOnly) {
     MockName = Name;
     MockBool = ExportedSymbolsOnly;
   }
-  void verifyFindSymbol(llvm::orc::JITSymbol Returned) {
+  void verifyFindSymbol(llvm::JITSymbol Returned) {
     EXPECT_EQ("findSymbol", LastCalled);
     EXPECT_EQ(MockSymbol.getAddress(), Returned.getAddress())
         << "Return should pass through";
     resetExpectations();
   }
 
-  JITSymbol findSymbolIn(ObjSetHandleT H, const std::string &Name,
-                         bool ExportedSymbolsOnly) {
+  llvm::JITSymbol findSymbolIn(ObjSetHandleT H, const std::string &Name,
+                               bool ExportedSymbolsOnly) {
     EXPECT_EQ(MockObjSetHandle, H) << "Handle should pass through";
     EXPECT_EQ(MockName, Name) << "Name should pass through";
     EXPECT_EQ(MockBool, ExportedSymbolsOnly) << "Flag should pass through";
     LastCalled = "findSymbolIn";
-    MockSymbol = JITSymbol(122, llvm::JITSymbolFlags::None);
+    MockSymbol = llvm::JITSymbol(122, llvm::JITSymbolFlags::None);
     return MockSymbol;
   }
   void expectFindSymbolIn(ObjSetHandleT H, const std::string &Name,
@@ -128,7 +129,7 @@ public:
     MockName = Name;
     MockBool = ExportedSymbolsOnly;
   }
-  void verifyFindSymbolIn(llvm::orc::JITSymbol Returned) {
+  void verifyFindSymbolIn(llvm::JITSymbol Returned) {
     EXPECT_EQ("findSymbolIn", LastCalled);
     EXPECT_EQ(MockSymbol.getAddress(), Returned.getAddress())
         << "Return should pass through";
@@ -146,14 +147,14 @@ public:
   }
 
   void mapSectionAddress(ObjSetHandleT H, const void *LocalAddress,
-                         TargetAddress TargetAddr) {
+                         llvm::JITTargetAddress TargetAddr) {
     EXPECT_EQ(MockObjSetHandle, H);
     EXPECT_EQ(MockLocalAddress, LocalAddress);
     EXPECT_EQ(MockTargetAddress, TargetAddr);
     LastCalled = "mapSectionAddress";
   }
   void expectMapSectionAddress(ObjSetHandleT H, const void *LocalAddress,
-                               TargetAddress TargetAddr) {
+                               llvm::JITTargetAddress TargetAddr) {
     MockObjSetHandle = H;
     MockLocalAddress = LocalAddress;
     MockTargetAddress = TargetAddr;
@@ -172,9 +173,9 @@ private:
   ObjSetHandleT MockObjSetHandle;
   std::string MockName;
   bool MockBool;
-  JITSymbol MockSymbol;
+  llvm::JITSymbol MockSymbol;
   const void *MockLocalAddress;
-  TargetAddress MockTargetAddress;
+  llvm::JITTargetAddress MockTargetAddress;
   MockMemoryBufferSet MockBufferSet;
 
   // Clear remembered parameters between calls
@@ -185,7 +186,7 @@ private:
     MockObjects.clear();
     MockObjSetHandle = 0;
     MockName = "bogus";
-    MockSymbol = JITSymbol(nullptr);
+    MockSymbol = llvm::JITSymbol(nullptr);
     MockLocalAddress = nullptr;
     MockTargetAddress = 0;
     MockBufferSet = 0;
@@ -245,7 +246,7 @@ TEST(ObjectTransformLayerTest, Main) {
   std::string Name = "foo";
   bool ExportedOnly = true;
   M.expectFindSymbol(Name, ExportedOnly);
-  JITSymbol Symbol = T2.findSymbol(Name, ExportedOnly);
+  llvm::JITSymbol Symbol = T2.findSymbol(Name, ExportedOnly);
   M.verifyFindSymbol(Symbol);
 
   // Test findSymbolIn
@@ -262,7 +263,7 @@ TEST(ObjectTransformLayerTest, Main) {
 
   // Test mapSectionAddress
   char Buffer[24];
-  TargetAddress MockAddress = 255;
+  llvm::JITTargetAddress MockAddress = 255;
   M.expectMapSectionAddress(H, Buffer, MockAddress);
   T1.mapSectionAddress(H, Buffer, MockAddress);
   M.verifyMapSectionAddress();