From 3d849f67cbae5807f18fb2d46dfccd3aeae3c39b Mon Sep 17 00:00:00 2001 From: Matthias Braun Date: Mon, 5 Nov 2018 23:49:13 +0000 Subject: MachineModuleInfo: Store more specific reference to LLVMTargetMachine; NFC MachineModuleInfo can only be used in code using lib/CodeGen, hence we can keep a more specific reference to LLVMTargetMachine rather than just TargetMachine around. llvm-svn: 346182 --- .../CodeGen/GlobalISel/PatternMatchTest.cpp | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'llvm/unittests/CodeGen/GlobalISel/PatternMatchTest.cpp') diff --git a/llvm/unittests/CodeGen/GlobalISel/PatternMatchTest.cpp b/llvm/unittests/CodeGen/GlobalISel/PatternMatchTest.cpp index 8f17b1991df..1f3a690ad01 100644 --- a/llvm/unittests/CodeGen/GlobalISel/PatternMatchTest.cpp +++ b/llvm/unittests/CodeGen/GlobalISel/PatternMatchTest.cpp @@ -43,7 +43,7 @@ void initLLVM() { /// Create a TargetMachine. As we lack a dedicated always available target for /// unittests, we go for "AArch64". -std::unique_ptr createTargetMachine() { +std::unique_ptr createTargetMachine() { Triple TargetTriple("aarch64--"); std::string Error; const Target *T = TargetRegistry::lookupTarget("", TargetTriple, Error); @@ -51,8 +51,9 @@ std::unique_ptr createTargetMachine() { return nullptr; TargetOptions Options; - return std::unique_ptr(T->createTargetMachine( - "AArch64", "", "", Options, None, None, CodeGenOpt::Aggressive)); + return std::unique_ptr(static_cast( + T->createTargetMachine("AArch64", "", "", Options, None, None, + CodeGenOpt::Aggressive))); } std::unique_ptr parseMIR(LLVMContext &Context, @@ -78,7 +79,7 @@ std::unique_ptr parseMIR(LLVMContext &Context, } std::pair, std::unique_ptr> -createDummyModule(LLVMContext &Context, const TargetMachine &TM, +createDummyModule(LLVMContext &Context, const LLVMTargetMachine &TM, StringRef MIRFunc) { SmallString<512> S; StringRef MIRString = (Twine(R"MIR( @@ -122,7 +123,7 @@ static void collectCopies(SmallVectorImpl &Copies, TEST(PatternMatchInstr, MatchIntConstant) { LLVMContext Context; - std::unique_ptr TM = createTargetMachine(); + std::unique_ptr TM = createTargetMachine(); if (!TM) return; auto ModuleMMIPair = createDummyModule(Context, *TM, ""); @@ -143,7 +144,7 @@ TEST(PatternMatchInstr, MatchIntConstant) { TEST(PatternMatchInstr, MatchBinaryOp) { LLVMContext Context; - std::unique_ptr TM = createTargetMachine(); + std::unique_ptr TM = createTargetMachine(); if (!TM) return; auto ModuleMMIPair = createDummyModule(Context, *TM, ""); @@ -270,7 +271,7 @@ TEST(PatternMatchInstr, MatchBinaryOp) { TEST(PatternMatchInstr, MatchFPUnaryOp) { LLVMContext Context; - std::unique_ptr TM = createTargetMachine(); + std::unique_ptr TM = createTargetMachine(); if (!TM) return; auto ModuleMMIPair = createDummyModule(Context, *TM, ""); @@ -341,7 +342,7 @@ TEST(PatternMatchInstr, MatchFPUnaryOp) { TEST(PatternMatchInstr, MatchExtendsTrunc) { LLVMContext Context; - std::unique_ptr TM = createTargetMachine(); + std::unique_ptr TM = createTargetMachine(); if (!TM) return; auto ModuleMMIPair = createDummyModule(Context, *TM, ""); @@ -397,7 +398,7 @@ TEST(PatternMatchInstr, MatchExtendsTrunc) { TEST(PatternMatchInstr, MatchSpecificType) { LLVMContext Context; - std::unique_ptr TM = createTargetMachine(); + std::unique_ptr TM = createTargetMachine(); if (!TM) return; auto ModuleMMIPair = createDummyModule(Context, *TM, ""); @@ -444,7 +445,7 @@ TEST(PatternMatchInstr, MatchSpecificType) { TEST(PatternMatchInstr, MatchCombinators) { LLVMContext Context; - std::unique_ptr TM = createTargetMachine(); + std::unique_ptr TM = createTargetMachine(); if (!TM) return; auto ModuleMMIPair = createDummyModule(Context, *TM, ""); -- cgit v1.2.3