Rename TargetInfo -> LinkingContext.

Also change some local variable names: "ti" -> "context" and
"_targetInfo" -> "_context".

Differential Revision: http://llvm-reviews.chandlerc.com/D1301

llvm-svn: 187823

1 files changed, 52 insertions, 55 deletions

diff --git a/lld/unittests/DriverTests/DarwinLdDriverTest.cpp b/lld/unittests/DriverTests/DarwinLdDriverTest.cpp
index 35d6a679da8..de1b306b25d 100644
--- a/lld/unittests/DriverTests/DarwinLdDriverTest.cpp
+++ b/lld/unittests/DriverTests/DarwinLdDriverTest.cpp
@@ -14,7 +14,7 @@
 
 #include "DriverTest.h"
 
-#include "lld/ReaderWriter/MachOTargetInfo.h"
+#include "lld/ReaderWriter/MachOLinkingContext.h"
 #include "../../lib/ReaderWriter/MachO/MachOFormat.hpp"
 
 using namespace llvm;
@@ -22,17 +22,16 @@ using namespace lld;
 
 namespace {
 
-class DarwinLdParserTest : public ParserTest<DarwinLdDriver, MachOTargetInfo> {
+class DarwinLdParserTest
+    : public ParserTest<DarwinLdDriver, MachOLinkingContext> {
 protected:
-  virtual const TargetInfo *targetInfo() {
-    return &_info;
-  }
+  virtual const LinkingContext *linkingContext() { return &_context; }
 };
 
 TEST_F(DarwinLdParserTest, Basic) {
   EXPECT_FALSE(parse("ld", "foo.o", "bar.o", nullptr));
-  EXPECT_FALSE(_info.allowRemainingUndefines());
-  EXPECT_FALSE(_info.deadStrip());
+  EXPECT_FALSE(_context.allowRemainingUndefines());
+  EXPECT_FALSE(_context.deadStrip());
   EXPECT_EQ(2, inputFileCount());
   EXPECT_EQ("foo.o", inputFile(0));
   EXPECT_EQ("bar.o", inputFile(1));
@@ -40,146 +39,144 @@ TEST_F(DarwinLdParserTest, Basic) {
 
 TEST_F(DarwinLdParserTest, Output) {
   EXPECT_FALSE(parse("ld", "-o", "my.out", "foo.o", nullptr));
-  EXPECT_EQ("my.out", _info.outputPath());
+  EXPECT_EQ("my.out", _context.outputPath());
 }
 
 TEST_F(DarwinLdParserTest, Dylib) {
   EXPECT_FALSE(parse("ld", "-dylib", "foo.o", nullptr));
-  EXPECT_EQ(mach_o::MH_DYLIB, _info.outputFileType());
+  EXPECT_EQ(mach_o::MH_DYLIB, _context.outputFileType());
 }
 
 TEST_F(DarwinLdParserTest, Relocatable) {
   EXPECT_FALSE(parse("ld", "-r", "foo.o", nullptr));
-  EXPECT_EQ(mach_o::MH_OBJECT, _info.outputFileType());
+  EXPECT_EQ(mach_o::MH_OBJECT, _context.outputFileType());
 }
 
 TEST_F(DarwinLdParserTest, Bundle) {
   EXPECT_FALSE(parse("ld", "-bundle", "foo.o", nullptr));
-  EXPECT_EQ(mach_o::MH_BUNDLE, _info.outputFileType());
+  EXPECT_EQ(mach_o::MH_BUNDLE, _context.outputFileType());
 }
 
 TEST_F(DarwinLdParserTest, Preload) {
   EXPECT_FALSE(parse("ld", "-preload", "foo.o", nullptr));
-  EXPECT_EQ(mach_o::MH_PRELOAD, _info.outputFileType());
+  EXPECT_EQ(mach_o::MH_PRELOAD, _context.outputFileType());
 }
 
 TEST_F(DarwinLdParserTest, Static) {
   EXPECT_FALSE(parse("ld", "-static", "foo.o", nullptr));
-  EXPECT_EQ(mach_o::MH_EXECUTE, _info.outputFileType());
+  EXPECT_EQ(mach_o::MH_EXECUTE, _context.outputFileType());
 }
 
 TEST_F(DarwinLdParserTest, Entry) {
   EXPECT_FALSE(parse("ld", "-e", "entryFunc", "foo.o", nullptr));
-  EXPECT_EQ("entryFunc", _info.entrySymbolName());
+  EXPECT_EQ("entryFunc", _context.entrySymbolName());
 }
 
 TEST_F(DarwinLdParserTest, OutputPath) {
   EXPECT_FALSE(parse("ld", "-o", "foo", "foo.o", nullptr));
-  EXPECT_EQ("foo", _info.outputPath());
+  EXPECT_EQ("foo", _context.outputPath());
 }
 
 TEST_F(DarwinLdParserTest, DeadStrip) {
   EXPECT_FALSE(parse("ld", "-dead_strip", "foo.o", nullptr));
-  EXPECT_TRUE(_info.deadStrip());
+  EXPECT_TRUE(_context.deadStrip());
 }
 
 TEST_F(DarwinLdParserTest, DeadStripRootsExe) {
   EXPECT_FALSE(parse("ld", "-dead_strip", "foo.o", nullptr));
-  EXPECT_FALSE(_info.globalsAreDeadStripRoots());
+  EXPECT_FALSE(_context.globalsAreDeadStripRoots());
 }
 
 TEST_F(DarwinLdParserTest, DeadStripRootsDylib) {
   EXPECT_FALSE(parse("ld", "-dylib", "-dead_strip", "foo.o", nullptr));
-  EXPECT_TRUE(_info.globalsAreDeadStripRoots());
+  EXPECT_TRUE(_context.globalsAreDeadStripRoots());
 }
 
 TEST_F(DarwinLdParserTest, ForceLoadArchive) {
   EXPECT_FALSE(parse("ld","-all_load", "foo.o", nullptr));
-  EXPECT_TRUE(_info.forceLoadAllArchives());
+  EXPECT_TRUE(_context.forceLoadAllArchives());
 }
 
 TEST_F(DarwinLdParserTest, NoForceLoadArchive) {
   EXPECT_FALSE(parse("ld", "foo.o", nullptr));
-  EXPECT_FALSE(_info.forceLoadAllArchives());
+  EXPECT_FALSE(_context.forceLoadAllArchives());
 }
 
 TEST_F(DarwinLdParserTest, Arch) {
   EXPECT_FALSE(parse("ld", "-arch", "x86_64", "foo.o", nullptr));
-  EXPECT_EQ(MachOTargetInfo::arch_x86_64, _info.arch());
-  EXPECT_EQ(mach_o::CPU_TYPE_X86_64, _info.getCPUType());
-  EXPECT_EQ(mach_o::CPU_SUBTYPE_X86_64_ALL, _info.getCPUSubType());
+  EXPECT_EQ(MachOLinkingContext::arch_x86_64, _context.arch());
+  EXPECT_EQ(mach_o::CPU_TYPE_X86_64, _context.getCPUType());
+  EXPECT_EQ(mach_o::CPU_SUBTYPE_X86_64_ALL, _context.getCPUSubType());
 }
 
 TEST_F(DarwinLdParserTest, Arch_x86) {
   EXPECT_FALSE(parse("ld", "-arch", "i386", "foo.o", nullptr));
-  EXPECT_EQ(MachOTargetInfo::arch_x86, _info.arch());
-  EXPECT_EQ(mach_o::CPU_TYPE_I386, _info.getCPUType());
-  EXPECT_EQ(mach_o::CPU_SUBTYPE_X86_ALL, _info.getCPUSubType());
+  EXPECT_EQ(MachOLinkingContext::arch_x86, _context.arch());
+  EXPECT_EQ(mach_o::CPU_TYPE_I386, _context.getCPUType());
+  EXPECT_EQ(mach_o::CPU_SUBTYPE_X86_ALL, _context.getCPUSubType());
 }
 
 TEST_F(DarwinLdParserTest, Arch_armv6) {
   EXPECT_FALSE(parse("ld", "-arch", "armv6", "foo.o", nullptr));
-  EXPECT_EQ(MachOTargetInfo::arch_armv6, _info.arch());
-  EXPECT_EQ(mach_o::CPU_TYPE_ARM, _info.getCPUType());
-  EXPECT_EQ(mach_o::CPU_SUBTYPE_ARM_V6, _info.getCPUSubType());
+  EXPECT_EQ(MachOLinkingContext::arch_armv6, _context.arch());
+  EXPECT_EQ(mach_o::CPU_TYPE_ARM, _context.getCPUType());
+  EXPECT_EQ(mach_o::CPU_SUBTYPE_ARM_V6, _context.getCPUSubType());
 }
 
 TEST_F(DarwinLdParserTest, Arch_armv7) {
   EXPECT_FALSE(parse("ld", "-arch", "armv7", "foo.o", nullptr));
-  EXPECT_EQ(MachOTargetInfo::arch_armv7, _info.arch());
-  EXPECT_EQ(mach_o::CPU_TYPE_ARM, _info.getCPUType());
-  EXPECT_EQ(mach_o::CPU_SUBTYPE_ARM_V7, _info.getCPUSubType());
+  EXPECT_EQ(MachOLinkingContext::arch_armv7, _context.arch());
+  EXPECT_EQ(mach_o::CPU_TYPE_ARM, _context.getCPUType());
+  EXPECT_EQ(mach_o::CPU_SUBTYPE_ARM_V7, _context.getCPUSubType());
 }
 
 TEST_F(DarwinLdParserTest, Arch_armv7s) {
   EXPECT_FALSE(parse("ld", "-arch", "armv7s", "foo.o", nullptr));
-  EXPECT_EQ(MachOTargetInfo::arch_armv7s, _info.arch());
-  EXPECT_EQ(mach_o::CPU_TYPE_ARM, _info.getCPUType());
-  EXPECT_EQ(mach_o::CPU_SUBTYPE_ARM_V7S, _info.getCPUSubType());
+  EXPECT_EQ(MachOLinkingContext::arch_armv7s, _context.arch());
+  EXPECT_EQ(mach_o::CPU_TYPE_ARM, _context.getCPUType());
+  EXPECT_EQ(mach_o::CPU_SUBTYPE_ARM_V7S, _context.getCPUSubType());
 }
 
 TEST_F(DarwinLdParserTest, MinMacOSX10_7) {
   EXPECT_FALSE(parse("ld", "-macosx_version_min", "10.7", "foo.o", nullptr));
-  EXPECT_EQ(MachOTargetInfo::OS::macOSX, _info.os());
-  EXPECT_TRUE(_info.minOS("10.7", ""));
-  EXPECT_FALSE(_info.minOS("10.8", ""));
+  EXPECT_EQ(MachOLinkingContext::OS::macOSX, _context.os());
+  EXPECT_TRUE(_context.minOS("10.7", ""));
+  EXPECT_FALSE(_context.minOS("10.8", ""));
 }
 
 TEST_F(DarwinLdParserTest, MinMacOSX10_8) {
   EXPECT_FALSE(parse("ld", "-macosx_version_min", "10.8.3", "foo.o", nullptr));
-  EXPECT_EQ(MachOTargetInfo::OS::macOSX, _info.os());
-  EXPECT_TRUE(_info.minOS("10.7", ""));
-  EXPECT_TRUE(_info.minOS("10.8", ""));
+  EXPECT_EQ(MachOLinkingContext::OS::macOSX, _context.os());
+  EXPECT_TRUE(_context.minOS("10.7", ""));
+  EXPECT_TRUE(_context.minOS("10.8", ""));
 }
 
 TEST_F(DarwinLdParserTest, iOS5) {
   EXPECT_FALSE(parse("ld", "-ios_version_min", "5.0", "foo.o", nullptr));
-  EXPECT_EQ(MachOTargetInfo::OS::iOS, _info.os());
-  EXPECT_TRUE(_info.minOS("", "5.0"));
-  EXPECT_FALSE(_info.minOS("", "6.0"));
+  EXPECT_EQ(MachOLinkingContext::OS::iOS, _context.os());
+  EXPECT_TRUE(_context.minOS("", "5.0"));
+  EXPECT_FALSE(_context.minOS("", "6.0"));
 }
 
 TEST_F(DarwinLdParserTest, iOS6) {
   EXPECT_FALSE(parse("ld", "-ios_version_min", "6.0", "foo.o", nullptr));
-  EXPECT_EQ(MachOTargetInfo::OS::iOS, _info.os());
-  EXPECT_TRUE(_info.minOS("", "5.0"));
-  EXPECT_TRUE(_info.minOS("", "6.0"));
+  EXPECT_EQ(MachOLinkingContext::OS::iOS, _context.os());
+  EXPECT_TRUE(_context.minOS("", "5.0"));
+  EXPECT_TRUE(_context.minOS("", "6.0"));
 }
 
 TEST_F(DarwinLdParserTest, iOS_Simulator5) {
   EXPECT_FALSE(parse("ld", "-ios_simulator_version_min", "5.0", "a.o", nullptr));
-  EXPECT_EQ(MachOTargetInfo::OS::iOS_simulator, _info.os());
-  EXPECT_TRUE(_info.minOS("", "5.0"));
-  EXPECT_FALSE(_info.minOS("", "6.0"));
+  EXPECT_EQ(MachOLinkingContext::OS::iOS_simulator, _context.os());
+  EXPECT_TRUE(_context.minOS("", "5.0"));
+  EXPECT_FALSE(_context.minOS("", "6.0"));
 }
 
 TEST_F(DarwinLdParserTest, iOS_Simulator6) {
   EXPECT_FALSE(parse("ld", "-ios_simulator_version_min", "6.0", "a.o", nullptr));
-  EXPECT_EQ(MachOTargetInfo::OS::iOS_simulator, _info.os());
-  EXPECT_TRUE(_info.minOS("", "5.0"));
-  EXPECT_TRUE(_info.minOS("", "6.0"));
+  EXPECT_EQ(MachOLinkingContext::OS::iOS_simulator, _context.os());
+  EXPECT_TRUE(_context.minOS("", "5.0"));
+  EXPECT_TRUE(_context.minOS("", "6.0"));
 }
 
-
-
 }  // end anonymous namespace